Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bc9068e authored by Julian Anastasov's avatar Julian Anastasov Committed by Simon Horman
Browse files

ipvs: fix CHECKSUM_PARTIAL for TCP, UDP 



 	Fix CHECKSUM_PARTIAL handling. Tested for IPv4 TCP,
UDP not tested because it needs network card with HW CSUM support.
May be fixes problem where IPVS can not be used in virtual boxes.
Problem appears with DNAT to local address when the local stack
sends reply in CHECKSUM_PARTIAL mode.

 	Fix tcp_dnat_handler and udp_dnat_handler to provide
vaddr and daddr in right order (old and new IP) when calling
tcp_partial_csum_update/udp_partial_csum_update (CHECKSUM_PARTIAL).

Signed-off-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent d86bef73

net/netfilter/ipvs/ip_vs_proto_tcp.c

+5 −5
Original line number Diff line number Diff line
@@ -101,15 +101,15 @@ tcp_partial_csum_update(int af, struct tcphdr *tcph, 
#ifdef CONFIG_IP_VS_IPV6

	if (af == AF_INET6)

		tcph->check =

			csum_fold(ip_vs_check_diff16(oldip->ip6, newip->ip6,

			~csum_fold(ip_vs_check_diff16(oldip->ip6, newip->ip6,

					 ip_vs_check_diff2(oldlen, newlen,

						~csum_unfold(tcph->check))));

						csum_unfold(tcph->check))));

	else

#endif

	tcph->check =

		csum_fold(ip_vs_check_diff4(oldip->ip, newip->ip,

		~csum_fold(ip_vs_check_diff4(oldip->ip, newip->ip,

				ip_vs_check_diff2(oldlen, newlen,

						~csum_unfold(tcph->check))));

						csum_unfold(tcph->check))));

}
@@ -223,7 +223,7 @@ tcp_dnat_handler(struct sk_buff *skb, 
	 *	Adjust TCP checksums

	 */

	if (skb->ip_summed == CHECKSUM_PARTIAL) {

		tcp_partial_csum_update(cp->af, tcph, &cp->daddr, &cp->vaddr,

		tcp_partial_csum_update(cp->af, tcph, &cp->vaddr, &cp->daddr,

					htons(oldlen),

					htons(skb->len - tcphoff));

	} else if (!cp->app) {

net/netfilter/ipvs/ip_vs_proto_udp.c

+5 −5
Original line number Diff line number Diff line
@@ -102,15 +102,15 @@ udp_partial_csum_update(int af, struct udphdr *uhdr, 
#ifdef CONFIG_IP_VS_IPV6

	if (af == AF_INET6)

		uhdr->check =

			csum_fold(ip_vs_check_diff16(oldip->ip6, newip->ip6,

			~csum_fold(ip_vs_check_diff16(oldip->ip6, newip->ip6,

					 ip_vs_check_diff2(oldlen, newlen,

						~csum_unfold(uhdr->check))));

						csum_unfold(uhdr->check))));

	else

#endif

	uhdr->check =

		csum_fold(ip_vs_check_diff4(oldip->ip, newip->ip,

		~csum_fold(ip_vs_check_diff4(oldip->ip, newip->ip,

				ip_vs_check_diff2(oldlen, newlen,

						~csum_unfold(uhdr->check))));

						csum_unfold(uhdr->check))));

}
@@ -229,7 +229,7 @@ udp_dnat_handler(struct sk_buff *skb, 
	 *	Adjust UDP checksums

	 */

	if (skb->ip_summed == CHECKSUM_PARTIAL) {

		udp_partial_csum_update(cp->af, udph, &cp->daddr, &cp->vaddr,

		udp_partial_csum_update(cp->af, udph, &cp->vaddr, &cp->daddr,

					htons(oldlen),

					htons(skb->len - udphoff));

	} else if (!cp->app && (udph->check != 0)) {