From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51A0CC4360F for ; Thu, 4 Apr 2019 04:41:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 279C9206C0 for ; Thu, 4 Apr 2019 04:41:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726775AbfDDEld (ORCPT ); Thu, 4 Apr 2019 00:41:33 -0400 Received: from shards.monkeyblade.net ([23.128.96.9]:35258 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725903AbfDDEld (ORCPT ); Thu, 4 Apr 2019 00:41:33 -0400 Received: from localhost (unknown [IPv6:2601:601:9f80:35cd::d71]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) (Authenticated sender: davem-davemloft) by shards.monkeyblade.net (Postfix) with ESMTPSA id 445A7144E3DEF; Wed, 3 Apr 2019 21:41:32 -0700 (PDT) Date: Wed, 03 Apr 2019 21:41:31 -0700 (PDT) Message-Id: <20190403.214131.1081946013901750428.davem@davemloft.net> To: steffen.klassert@secunet.com Cc: edumazet@google.com, netdev@vger.kernel.org Subject: Re: [PATCH] net-gro: Fix GRO flush when receiving a GSO packet. From: David Miller In-Reply-To: <20190402061603.GG16093@gauss3.secunet.de> References: <20190402061603.GG16093@gauss3.secunet.de> X-Mailer: Mew version 6.8 on Emacs 26.1 Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.12 (shards.monkeyblade.net [149.20.54.216]); Wed, 03 Apr 2019 21:41:32 -0700 (PDT) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Steffen Klassert 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 Applied and queued up for -stable, thanks.