Commit af352460 authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller
Browse files

net: fix GRO skb truesize update 



commit 5e10da53 ("skbuff: allow 'slow_gro' for skb carring sock
reference") introduces a serious regression at the GRO layer setting
the wrong truesize for stolen-head skbs.

Restore the correct truesize: SKB_DATA_ALIGN(...) instead of
SKB_TRUESIZE(...)

Reported-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Fixes: 5e10da53 ("skbuff: allow 'slow_gro' for skb carring sock reference")
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Tested-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 83945480

net/core/skbuff.c

+1 −1
Original line number Diff line number Diff line
@@ -4369,7 +4369,7 @@ int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb) 
		memcpy(frag + 1, skbinfo->frags, sizeof(*frag) * skbinfo->nr_frags);

		/* We dont need to clear skbinfo->nr_frags here */



		new_truesize = SKB_TRUESIZE(sizeof(struct sk_buff));

		new_truesize = SKB_DATA_ALIGN(sizeof(struct sk_buff));

		delta_truesize = skb->truesize - new_truesize;

		skb->truesize = new_truesize;

		NAPI_GRO_CB(skb)->free = NAPI_GRO_FREE_STOLEN_HEAD;