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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 9D788C48BD9 for ; Thu, 27 Jun 2019 00:53:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6BB2B20663 for ; Thu, 27 Jun 2019 00:53:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561596838; bh=KdG4ys/EbdwGWGorWXkNHp73Xx5QtYhHJc3V328rR0o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=G27Rkvkv0fpKhOA0UDLcjnYbAq4L9BAFVM5Kc4IGglEJqz40W5/e/8PrU/3ZHIRor B28QBe78B3EzRiaWKYncksjqFPQOpkdJL8DMDWbw7UR0d86P6OPcm+FDYUrBpzpaDa jEO3Sl8skpoigJP1ARct0jbsr50GN6MEkxbcRtIo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726869AbfF0AcG (ORCPT ); Wed, 26 Jun 2019 20:32:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:35720 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727358AbfF0AcF (ORCPT ); Wed, 26 Jun 2019 20:32:05 -0400 Received: from sasha-vm.mshome.net (unknown [107.242.116.147]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5BDF42083B; Thu, 27 Jun 2019 00:32:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561595524; bh=KdG4ys/EbdwGWGorWXkNHp73Xx5QtYhHJc3V328rR0o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fFI43Isv7FKdohQyCaepzVXuiAcEw3XGY5FSjcdqf1uie2c3Ok6DDLTM9SXcMo0Z3 VpdjWX7keLe7DfRM3O1zFetNrBdOPSW4QfyQomhO/D4/Jjm9kDOjome8s5PnU7TwCR CS8Cvpkja1jv4HqDqMS3Txv3+46fhogbzFel8NVc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Martin KaFai Lau , Craig Gallek , Song Liu , Alexei Starovoitov , Sasha Levin , netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 5.1 30/95] bpf: udp: ipv6: Avoid running reuseport's bpf_prog from __udp6_lib_err Date: Wed, 26 Jun 2019 20:29:15 -0400 Message-Id: <20190627003021.19867-30-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190627003021.19867-1-sashal@kernel.org> References: <20190627003021.19867-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Martin KaFai Lau [ Upstream commit 4ac30c4b3659efac031818c418beb51e630d512d ] __udp6_lib_err() may be called when handling icmpv6 message. For example, the icmpv6 toobig(type=2). __udp6_lib_lookup() is then called which may call reuseport_select_sock(). reuseport_select_sock() will call into a bpf_prog (if there is one). reuseport_select_sock() is expecting the skb->data pointing to the transport header (udphdr in this case). For example, run_bpf_filter() is pulling the transport header. However, in the __udp6_lib_err() path, the skb->data is pointing to the ipv6hdr instead of the udphdr. One option is to pull and push the ipv6hdr in __udp6_lib_err(). Instead of doing this, this patch follows how the original commit 538950a1b752 ("soreuseport: setsockopt SO_ATTACH_REUSEPORT_[CE]BPF") was done in IPv4, which has passed a NULL skb pointer to reuseport_select_sock(). Fixes: 538950a1b752 ("soreuseport: setsockopt SO_ATTACH_REUSEPORT_[CE]BPF") Cc: Craig Gallek Signed-off-by: Martin KaFai Lau Acked-by: Song Liu Acked-by: Craig Gallek Signed-off-by: Alexei Starovoitov Signed-off-by: Sasha Levin --- net/ipv6/udp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 622eeaf5732b..767583c12bf2 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -516,7 +516,7 @@ int __udp6_lib_err(struct sk_buff *skb, struct inet6_skb_parm *opt, struct net *net = dev_net(skb->dev); sk = __udp6_lib_lookup(net, daddr, uh->dest, saddr, uh->source, - inet6_iif(skb), inet6_sdif(skb), udptable, skb); + inet6_iif(skb), inet6_sdif(skb), udptable, NULL); if (!sk) { /* No socket for error: try tunnels before discarding */ sk = ERR_PTR(-ENOENT); -- 2.20.1