Commit 113f99c3 authored by Willem de Bruijn's avatar Willem de Bruijn Committed by David S. Miller

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: 1da177e4 ("Linux-2.6.12-rc2")
Reported-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarWillem de Bruijn <willemb@google.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 374edea4
...@@ -1045,7 +1045,8 @@ static int __ip_append_data(struct sock *sk, ...@@ -1045,7 +1045,8 @@ static int __ip_append_data(struct sock *sk,
if (copy > length) if (copy > length)
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; unsigned int off;
off = skb->len; off = skb->len;
......
...@@ -1503,7 +1503,8 @@ static int __ip6_append_data(struct sock *sk, ...@@ -1503,7 +1503,8 @@ static int __ip6_append_data(struct sock *sk,
if (copy > length) if (copy > length)
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; unsigned int off;
off = skb->len; off = skb->len;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment