Commit 37fe4732 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

gro: Fix merging of paged packets 



The previous fix to paged packets broke the merging because it
reset the skb->len before we added it to the merged packet.  This
wasn't detected because it simply resulted in the truncation of
the packet while the missing bit is subsequently retransmitted.

The fix is to store skb->len before we clobber it.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9a8e47ff

net/core/skbuff.c

+5 −4
Original line number Diff line number Diff line
@@ -2585,8 +2585,9 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb) 
	struct sk_buff *nskb;

	unsigned int headroom;

	unsigned int hlen = p->data - skb_mac_header(p);

	unsigned int len = skb->len;



	if (hlen + p->len + skb->len >= 65536)

	if (hlen + p->len + len >= 65536)

		return -E2BIG;



	if (skb_shinfo(p)->frag_list)
@@ -2648,9 +2649,9 @@ merge: 


done:

	NAPI_GRO_CB(p)->count++;

	p->data_len += skb->len;

	p->truesize += skb->len;

	p->len += skb->len;

	p->data_len += len;

	p->truesize += len;

	p->len += len;



	NAPI_GRO_CB(skb)->same_flow = 1;

	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE