diff options
| author |   Paolo Abeni <pabeni@redhat.com> | 2021-08-04 21:07:00 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-08-05 11:32:31 +0100 |
| commit | af352460b465d7a8afbeb3be07c0268d1d48a4d7 (patch) | |
| tree | 7127b0bd26a2bc9a6a76236ddb2db2241c4a19e1 /net/core/skbuff.c | |
| parent | Merge branch 'ipa-runtime-pm' (diff) | |
| download | linux-dev-af352460b465d7a8afbeb3be07c0268d1d48a4d7.tar.xz linux-dev-af352460b465d7a8afbeb3be07c0268d1d48a4d7.zip | |
net: fix GRO skb truesize update
commit 5e10da5385d2 ("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: Mat Martineau <mathew.j.martineau@linux.intel.com>
Fixes: 5e10da5385d2 ("skbuff: allow 'slow_gro' for skb carring sock reference")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Tested-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/skbuff.c')
| -rw-r--r-- | net/core/skbuff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 8bac7a1a81ba..9240af2ea8c9 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -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; |