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=-8.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,MAILING_LIST_MULTI, SPF_HELO_NONE,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 72682C433B4 for ; Fri, 23 Apr 2021 20:44:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4F0EE61406 for ; Fri, 23 Apr 2021 20:44:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243798AbhDWUpV (ORCPT ); Fri, 23 Apr 2021 16:45:21 -0400 Received: from shards.monkeyblade.net ([23.128.96.9]:59592 "EHLO mail.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231721AbhDWUpS (ORCPT ); Fri, 23 Apr 2021 16:45:18 -0400 Received: from localhost (unknown [IPv6:2601:601:9f00:477::3d5]) by mail.monkeyblade.net (Postfix) with ESMTPSA id 9EB294D2ADD04; Fri, 23 Apr 2021 13:44:40 -0700 (PDT) Date: Fri, 23 Apr 2021 13:44:40 -0700 (PDT) Message-Id: <20210423.134440.604990654040210950.davem@davemloft.net> To: sd@queasysnail.net Cc: phil@philpotter.co.uk, kuba@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, edumazet@google.com, fw@strlen.de Subject: Re: [PATCH v2] net: geneve: modify IP header check in geneve6_xmit_skb and geneve_xmit_skb From: David Miller In-Reply-To: References: <20210422234945.1190-1-phil@philpotter.co.uk> X-Mailer: Mew version 6.8 on Emacs 27.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.6.2 (mail.monkeyblade.net [0.0.0.0]); Fri, 23 Apr 2021 13:44:40 -0700 (PDT) Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Sabrina Dubroca Date: Fri, 23 Apr 2021 15:41:17 +0200 > 2021-04-23, 00:49:45 +0100, Phillip Potter wrote: >> Modify the header size check in geneve6_xmit_skb and geneve_xmit_skb >> to use pskb_inet_may_pull rather than pskb_network_may_pull. This fixes >> two kernel selftest failures introduced by the commit introducing the >> checks: >> IPv4 over geneve6: PMTU exceptions >> IPv4 over geneve6: PMTU exceptions - nexthop objects >> >> It does this by correctly accounting for the fact that IPv4 packets may >> transit over geneve IPv6 tunnels (and vice versa), and still fixes the >> uninit-value bug fixed by the original commit. >> >> Reported-by: kernel test robot >> Fixes: 6628ddfec758 ("net: geneve: check skb is large enough for IPv4/IPv6 header") >> Suggested-by: Sabrina Dubroca >> Signed-off-by: Phillip Potter >> --- >> >> V2: >> * Incorporated feedback from Sabrina Dubroca regarding pskb_inet_may_pull >> * Added Fixes: tag as requested by Eric Dumazet > > Thanks Phillip. > > Acked-by: Sabrina Dubroca > > Jakub/David, it would be great if this could get in 5.12, otherwise > geneve is a bit broken: > https://bugzilla.kernel.org/show_bug.cgi?id=212749 I don't think we will submit another pull req for networking, but thatys ok it'll end up in stable eventually. Thanks.