From patchwork Wed Nov 11 20:45:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Lobakin X-Patchwork-Id: 11898539 X-Patchwork-Delegate: kuba@kernel.org 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=-9.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 0210EC5517A for ; Wed, 11 Nov 2020 20:45:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 860E5208B8 for ; Wed, 11 Nov 2020 20:45:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=pm.me header.i=@pm.me header.b="LaabHsZW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726776AbgKKUpd (ORCPT ); Wed, 11 Nov 2020 15:45:33 -0500 Received: from mail-40131.protonmail.ch ([185.70.40.131]:56125 "EHLO mail-40131.protonmail.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725900AbgKKUpd (ORCPT ); Wed, 11 Nov 2020 15:45:33 -0500 X-Greylist: delayed 161883 seconds by postgrey-1.27 at vger.kernel.org; Wed, 11 Nov 2020 15:45:31 EST Date: Wed, 11 Nov 2020 20:45:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail; t=1605127530; bh=bsLJnkXi8MeTMrm7MqVIftcvsnbFJMQr1qH+ckDYG2k=; h=Date:To:From:Cc:Reply-To:Subject:From; b=LaabHsZW/4JyVGzDppF9Qsi1NifWmzt017nLH0mUXhbmTxR6qnRwAOmnupAFgxX05 bbE4t4Yt+Wivm9xgyLaYTnRZoKb7FPOBn+LoAMVV07vZlWgc6qwXD/TOn6uCjup+Xk xvGkzzSiKeCgJLCSRujLkdEnJoHCQYo4GKeaEcLS7YwsjM9uMo0W+XnuHaBk4HRUsh x9iMux9RfALDHdCeFL+9kR1+jTUPZnwEDTrNYCzp8WJbtE9DO/sGsAI1MOA6mcv7y0 EZnQfr0XRk/SAPfj1b6ihVHPtw5o1UjxX7cZUGxfofms5gSX96GOjn0Gy8V/G/CWrk 0/aIc/IkQmrIg== To: "David S. Miller" , Jakub Kicinski From: Alexander Lobakin Cc: Alexey Kuznetsov , Hideaki YOSHIFUJI , Paolo Abeni , Willem de Bruijn , Steffen Klassert , Alexander Lobakin , Eric Dumazet , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Reply-To: Alexander Lobakin Subject: [PATCH v5 net 1/2] net: udp: fix UDP header access on Fast/frag0 UDP GRO Message-ID: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org UDP GRO uses udp_hdr(skb) in its .gro_receive() callback. While it's probably OK for non-frag0 paths (when all headers or even the entire frame are already in skb head), this inline points to junk when using Fast GRO (napi_gro_frags() or napi_gro_receive() with only Ethernet header in skb head and all the rest in the frags) and breaks GRO packet compilation and the packet flow itself. To support both modes, skb_gro_header_fast() + skb_gro_header_slow() are typically used. UDP even has an inline helper that makes use of them, udp_gro_udphdr(). Use that instead of troublemaking udp_hdr() to get rid of the out-of-order delivers. Present since the introduction of plain UDP GRO in 5.0-rc1. Fixes: e20cf8d3f1f7 ("udp: implement GRO for plain UDP sockets.") Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Willem de Bruijn Signed-off-by: Alexander Lobakin Acked-by: Willem de Bruijn --- net/ipv4/udp_offload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c index e67a66fbf27b..13740e9fe6ec 100644 --- a/net/ipv4/udp_offload.c +++ b/net/ipv4/udp_offload.c @@ -366,7 +366,7 @@ static struct sk_buff *udp4_ufo_fragment(struct sk_buff *skb, static struct sk_buff *udp_gro_receive_segment(struct list_head *head, struct sk_buff *skb) { - struct udphdr *uh = udp_hdr(skb); + struct udphdr *uh = udp_gro_udphdr(skb); struct sk_buff *pp = NULL; struct udphdr *uh2; struct sk_buff *p;