Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64289c8e authored by Jarek Poplawski's avatar Jarek Poplawski Committed by David S. Miller
Browse files

gro: Re-fix different skb headrooms 

The patch: "gro: fix different skb headrooms" in its part:
"2) allocate a minimal skb for head of frag_list" is buggy. The copied
skb has p->data set at the ip header at the moment, and skb_gro_offset
is the length of ip + tcp headers. So, after the change the length of
mac header is skipped. Later skb_set_mac_header() sets it into the
NET_SKB_PAD area (if it's long enough) and ip header is misaligned at
NET_SKB_PAD + NET_IP_ALIGN offset. There is no reason to assume the
original skb was wrongly allocated, so let's copy it as it was.

bugzilla : https://bugzilla.kernel.org/show_bug.cgi?id=16626


fixes commit: 3d3be433

Reported-by: default avatarPlamen Petrov <pvp-lsts@fs.uni-ruse.bg>
Signed-off-by: default avatarJarek Poplawski <jarkao2@gmail.com>
CC: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Tested-by: default avatarPlamen Petrov <pvp-lsts@fs.uni-ruse.bg>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent de2b96f1

net/core/skbuff.c

+1 −1
Original line number Diff line number Diff line
@@ -2706,7 +2706,7 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb) 
	} else if (skb_gro_len(p) != pinfo->gso_size)

		return -E2BIG;



	headroom = NET_SKB_PAD + NET_IP_ALIGN;

	headroom = skb_headroom(p);

	nskb = alloc_skb(headroom + skb_gro_offset(p), GFP_ATOMIC);

	if (unlikely(!nskb))

		return -ENOMEM;