From: Steffen Klassert <steffen.klass...@secunet.com> Date: Tue, 2 Apr 2019 08:16:03 +0200
> 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 in this case because > the assumptions on the skb layout are not met in this case. > 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.klass...@secunet.com> Applied and queued up for -stable, thanks.