diff options
| author | Steffen Klassert <steffen.klassert@secunet.com> | 2011-06-29 23:19:32 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-01 17:33:19 -0700 |
| commit | c146066ab80267c3305de5dda6a4083f06df9265 (patch) | |
| tree | 2eda84544f43e8ec2e6051af36b9cc90a4171c9b /net | |
| parent | 12fdb4d3babcde43834c54dee22a69bb73adbae7 (diff) | |
| download | linux-3.10-c146066ab80267c3305de5dda6a4083f06df9265.tar.gz linux-3.10-c146066ab80267c3305de5dda6a4083f06df9265.tar.bz2 linux-3.10-c146066ab80267c3305de5dda6a4083f06df9265.zip | |
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 <steffen.klassert@secunet.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/ip_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 4a7e16b5d3f..84f26e8e6c6 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -828,7 +828,7 @@ static int __ip_append_data(struct sock *sk, cork->length += length; if (((length > mtu) || (skb && skb_is_gso(skb))) && (sk->sk_protocol == IPPROTO_UDP) && - (rt->dst.dev->features & NETIF_F_UFO)) { + (rt->dst.dev->features & NETIF_F_UFO) && !rt->dst.header_len) { err = ip_ufo_append_data(sk, queue, getfrag, from, length, hh_len, fragheaderlen, transhdrlen, mtu, flags); |