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

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

ipvs: properly declare tunnel encapsulation 



The tunneling method should properly use tunnel encapsulation.
Fixes problem with CHECKSUM_PARTIAL packets when TCP/UDP csum
offload is supported.

Thanks to Alex Gartrell for reporting the problem, providing
solution and for all suggestions.

Reported-by: default avatarAlex Gartrell <agartrell@fb.com>
Signed-off-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarAlex Gartrell <agartrell@fb.com>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent d1c85c2e

net/netfilter/ipvs/ip_vs_xmit.c

+16 −4
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <net/route.h>                  /* for ip_route_output */

#include <net/ipv6.h>

#include <net/ip6_route.h>

#include <net/ip_tunnels.h>

#include <net/addrconf.h>

#include <linux/icmpv6.h>

#include <linux/netfilter.h>
@@ -862,11 +863,15 @@ ip_vs_tunnel_xmit(struct sk_buff *skb, struct ip_vs_conn *cp, 
		old_iph = ip_hdr(skb);

	}



	skb->transport_header = skb->network_header;



	/* fix old IP header checksum */

	ip_send_check(old_iph);



	skb = iptunnel_handle_offloads(skb, false, SKB_GSO_IPIP);

	if (IS_ERR(skb))

		goto tx_error;



	skb->transport_header = skb->network_header;



	skb_push(skb, sizeof(struct iphdr));

	skb_reset_network_header(skb);

	memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
@@ -900,6 +905,7 @@ ip_vs_tunnel_xmit(struct sk_buff *skb, struct ip_vs_conn *cp, 
	return NF_STOLEN;



  tx_error:

	if (!IS_ERR(skb))

		kfree_skb(skb);

	rcu_read_unlock();

	LeaveFunction(10);
@@ -953,6 +959,11 @@ ip_vs_tunnel_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp, 
		old_iph = ipv6_hdr(skb);

	}



	/* GSO: we need to provide proper SKB_GSO_ value for IPv6 */

	skb = iptunnel_handle_offloads(skb, false, 0); /* SKB_GSO_SIT/IPV6 */

	if (IS_ERR(skb))

		goto tx_error;



	skb->transport_header = skb->network_header;



	skb_push(skb, sizeof(struct ipv6hdr));
@@ -988,6 +999,7 @@ ip_vs_tunnel_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp, 
	return NF_STOLEN;



tx_error:

	if (!IS_ERR(skb))

		kfree_skb(skb);

	rcu_read_unlock();

	LeaveFunction(10);