diff options
| author | Steffen Klassert | 2019-04-02 08:16:03 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-04-17 08:38:40 +0200 |
| commit | b87ec81362ac54ad33a001fffb11d1b9d9a28fc8 (patch) | |
| tree | 385bdef86de95d07db681bee9cdd3737aa640418 /net/core | |
| parent | net: ethtool: not call vzalloc for zero sized memory request (diff) | |
| download | kernel-qcow2-linux-b87ec81362ac54ad33a001fffb11d1b9d9a28fc8.tar.gz kernel-qcow2-linux-b87ec81362ac54ad33a001fffb11d1b9d9a28fc8.tar.xz kernel-qcow2-linux-b87ec81362ac54ad33a001fffb11d1b9d9a28fc8.zip | |
net-gro: Fix GRO flush when receiving a GSO packet.
[ Upstream commit 0ab03f353d3613ea49d1f924faf98559003670a8 ]
Currently we may merge incorrectly a received GSO packet
or a packet with frag_list into a packet sitting in the
gro_hash list. skb_segment() may crash case because
the assumptions on the skb layout are not met.
The correct behaviour would be to flush the packet in the
gro_hash list and send the received GSO packet directly
afterwards. Commit d61d072e87c8e ("net-gro: avoid reorders")
sets NAPI_GRO_CB(skb)->flush in this case, but this is not
checked before merging. This patch makes sure to check this
flag and to not merge in that case.
Fixes: d61d072e87c8e ("net-gro: avoid reorders")
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net/core')
| -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 8656b1e20d35..ceee28e184af 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -3832,7 +3832,7 @@ int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb) unsigned int delta_truesize; struct sk_buff *lp; - if (unlikely(p->len + len >= 65536)) + if (unlikely(p->len + len >= 65536 || NAPI_GRO_CB(skb)->flush)) return -E2BIG; lp = NAPI_GRO_CB(p)->last; |