diff options
| author | Willem de Bruijn <willemb@google.com> | 2018-05-17 13:13:29 -0400 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2018-10-21 08:46:13 +0100 |
| commit | 464f6f04bca1173c8f89c505cefea61691b2a1d2 (patch) | |
| tree | e8a75c7743a4099c42b6b2d5f04b3094eebf9f5e /net/ipv4 | |
| parent | 05e362bb0df2d4f68229740f10ce0a61d073a4c5 (diff) | |
| download | linux-stable-464f6f04bca1173c8f89c505cefea61691b2a1d2.tar.gz linux-stable-464f6f04bca1173c8f89c505cefea61691b2a1d2.tar.bz2 linux-stable-464f6f04bca1173c8f89c505cefea61691b2a1d2.zip | |
net: test tailroom before appending to linear skb
commit 113f99c3358564a0647d444c2ae34e8b1abfd5b9 upstream.
Device features may change during transmission. In particular with
corking, a device may toggle scatter-gather in between allocating
and writing to an skb.
Do not unconditionally assume that !NETIF_F_SG at write time implies
that the same held at alloc time and thus the skb has sufficient
tailroom.
This issue predates git history.
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Reported-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Willem de Bruijn <willemb@google.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/ip_output.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 6561c103e216..109eddf0248a 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c @@ -1025,7 +1025,8 @@ alloc_new_skb: if (copy > length) copy = length; - if (!(rt->dst.dev->features&NETIF_F_SG)) { + if (!(rt->dst.dev->features&NETIF_F_SG) && + skb_tailroom(skb) >= copy) { unsigned int off; off = skb->len; |