]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: test tailroom before appending to linear skb
authorWillem de Bruijn <willemb@google.com>
Thu, 17 May 2018 17:13:29 +0000 (13:13 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 17 May 2018 21:05:01 +0000 (17:05 -0400)
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>
net/ipv4/ip_output.c
net/ipv6/ip6_output.c

index 83c73bab2c3de90254e11e4126d7cb77ed998f03..d54abc0978006169be261e6d77fa0b296e94b9c4 100644 (file)
@@ -1045,7 +1045,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;
index 2e891d2c30efd3909e42810d3debba677776dd94..7b6d1689087bd58db1e92fc8991d84ae205629f0 100644 (file)
@@ -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;