openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Alex Gartrell <agartrell@fb.com>
Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Alex Gartrell <agartrell@fb.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
This commit is contained in:
Julian Anastasov 2014-08-01 10:36:17 +03:00 committed by Simon Horman
parent d1c85c2ebe
commit ea1d5d7755
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/netfilter/ipvs/ip_vs_xmit.c
View File

@ -38,6 +38,7 @@
#include <net/route.h> /* for ip_route_output */ #include <net/route.h> /* for ip_route_output */
#include <net/ipv6.h> #include <net/ipv6.h>
#include <net/ip6_route.h> #include <net/ip6_route.h>
#include <net/ip_tunnels.h>
#include <net/addrconf.h> #include <net/addrconf.h>
#include <linux/icmpv6.h> #include <linux/icmpv6.h>
#include <linux/netfilter.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); old_iph = ip_hdr(skb);
} }
skb->transport_header = skb->network_header;
/* fix old IP header checksum */ /* fix old IP header checksum */
ip_send_check(old_iph); 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_push(skb, sizeof(struct iphdr));
skb_reset_network_header(skb); skb_reset_network_header(skb);
memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt)); 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; return NF_STOLEN;
tx_error: tx_error:
if (!IS_ERR(skb))
kfree_skb(skb); kfree_skb(skb);
rcu_read_unlock(); rcu_read_unlock();
LeaveFunction(10); 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); 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->transport_header = skb->network_header;
skb_push(skb, sizeof(struct ipv6hdr)); 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; return NF_STOLEN;
tx_error: tx_error:
if (!IS_ERR(skb))
kfree_skb(skb); kfree_skb(skb);
rcu_read_unlock(); rcu_read_unlock();
LeaveFunction(10); LeaveFunction(10);