diff options
| author |   Willem de Bruijn <willemb@google.com> | 2018-05-17 13:13:29 -0400 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-05-17 17:05:01 -0400 |
| commit | 113f99c3358564a0647d444c2ae34e8b1abfd5b9 (patch) | |
| tree | 9f8a2ef799de5be76bb83fb73524b2575a5759af /net/ipv6/ip6_output.c | |
| parent | Merge branch 'ip6_gre-Fixes-in-headroom-handling' (diff) | |
| download | linux-dev-113f99c3358564a0647d444c2ae34e8b1abfd5b9.tar.xz linux-dev-113f99c3358564a0647d444c2ae34e8b1abfd5b9.zip | |
net: test tailroom before appending to linear skb
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>
Diffstat (limited to 'net/ipv6/ip6_output.c')
| -rw-r--r-- | net/ipv6/ip6_output.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 2e891d2c30ef..7b6d1689087b 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -1503,7 +1503,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; |