From: Steffen Klassert Date: Wed, 29 Jun 2011 23:19:32 +0000 (+0000) Subject: ipv4: Don't use ufo handling on later transformed packets X-Git-Tag: v2.6.32.66~20 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=417b2efd69006e3868628e035c7d8151ea983c82;p=thirdparty%2Fkernel%2Fstable.git ipv4: Don't use ufo handling on later transformed packets We might call ip_ufo_append_data() for packets that will be IPsec transformed later. This function should be used just for real udp packets. So we check for rt->dst.header_len which is only nonzero on IPsec handling and call ip_ufo_append_data() just if rt->dst.header_len is zero. Signed-off-by: Steffen Klassert Signed-off-by: David S. Miller (cherry picked from commit c146066ab80267c3305de5dda6a4083f06df9265) Signed-off-by: Willy Tarreau --- diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index faa662396bc8c..bd5c4b388129b 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -878,6 +878,7 @@ int ip_append_data(struct sock *sk, if (((length > mtu) || (skb && skb_has_frags(skb))) && (sk->sk_protocol == IPPROTO_UDP) && (rt->u.dst.dev->features & NETIF_F_UFO)) { + (rt->u.dst.dev->features & NETIF_F_UFO) && !rt->u.dst.header_len) { err = ip_ufo_append_data(sk, getfrag, from, length, hh_len, fragheaderlen, transhdrlen, mtu, flags);