From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6242E1AF0C3 for ; Fri, 28 Feb 2025 05:00:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740718805; cv=none; b=ueKyCDxPeP6mPyemOjVhyh1Hc948mUrOZRWzLmatgzStI/wafpED2tCfoXcdJbMkNJZk48pPH9H6GEAxYgPtV5t4P11LIoLXyjAbRhg7ClNRYbWRaqTjbvVld6FxZgb90I4dPd872uk4S6YiX8x7GcTFrcFrzWe94yEshZ3YBf8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740718805; c=relaxed/simple; bh=UR5I6vrxVtLglUwsbPjNxLGv/i2RjbgYn5C1RHupj5g=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=SN/ucDZbUM8v/wFNns7PgbA5LVxflHLOskbVkM6OTzW1j3KKQfucVG0dHyxCBTagPaNof9g0qbq+oyx0+8igtOO3qmuxyepgwAIShBLU8ZfO+2K0i8j5Iyxj3Xbk5iValCKeiKOSNopr5spVtywPapZzACtk8o4CRkKLrah+DIc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=psfNesbI; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="psfNesbI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 952E7C4CED6; Fri, 28 Feb 2025 05:00:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1740718804; bh=UR5I6vrxVtLglUwsbPjNxLGv/i2RjbgYn5C1RHupj5g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=psfNesbIb9IWWpUSz6VALSUedLmMjVA0BXGHybxuic5dkEtDSqS4qX2g+X+VaxWpE cu8z3oknAh2Y9VvBa6h2HXzIarwxTTM5FSloWCC9ByZGZup3Wssq9v41pbhMYSbJj1 Tc5e6Ff87vF+uqr/Q5qxhblbJoGOctxONPMPaCZSNwoBVnrFoAwQVrSmJL7Z8q6mK0 pMnjJjgPJG7dBRXv2/qSNxPwvxyFSgO7whIWPy0lhNYLQV2yZoX6XsjBMqVb1YVsCe jIM1ViXEgdktef0bFnb7yQLN9RMz3dmYHZq7EWFXDzRDks4FwW6iZ1Spfnu0DpaWW/ picfywJGsWLQQ== From: Sasha Levin To: stable@vger.kernel.org, rcn@igalia.com Cc: Sasha Levin Subject: Re: [PATCH 6.6 v3 2/3] tun: Assign missing bpf_net_context. Date: Thu, 27 Feb 2025 23:56:19 -0500 Message-Id: <20250227151928-caedbf3902b1850e@stable.kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250226-20250204-kasan-slab-use-after-free-read-in-dev_map_enqueue__submit-v3-2-360efec441ba@igalia.com> References: Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ Sasha's backport helper bot ] Hi, Summary of potential issues: ℹ️ This is part 2/3 of a series ⚠️ Found follow-up fixes in mainline The upstream commit SHA1 provided is correct: fecef4cd42c689a200bdd39e6fffa71475904bc1 WARNING: Author mismatch between patch and upstream commit: Backport author: =?utf-8?q?Ricardo_Ca=C3=B1uelo_Navarro?= Commit author: Sebastian Andrzej Siewior Found fixes commits: 9da49aa80d68 tun: Add missing bpf_net_ctx_clear() in do_xdp_generic() Note: The patch differs from the upstream commit: --- 1: fecef4cd42c68 ! 1: 54a183ca55664 tun: Assign missing bpf_net_context. @@ Metadata ## Commit message ## tun: Assign missing bpf_net_context. + [ Upstream commit fecef4cd42c689a200bdd39e6fffa71475904bc1 ] + During the introduction of struct bpf_net_context handling for XDP-redirect, the tun driver has been missed. Jakub also pointed out that there is another call chain to @@ Commit message Signed-off-by: Sebastian Andrzej Siewior Link: https://patch.msgid.link/20240704144815.j8xQda5r@linutronix.de Signed-off-by: Jakub Kicinski + [rcn: Backport the patch to address minor differences in the context lines. + These differences are introduced by upstream commits + 4d2bb0bfe874 ("xdp: rely on skb pointer reference in do_xdp_generic and + netif_receive_generic_xdp") and 7cd1107f48e2a ("bpf, xdp: constify some + bpf_prog * function arguments"), which change the parameters in + do_xdp_generic() and in calls to netif_receive_generic_xdp(), + kfree_skb_reason() and generic_xdp_tx(). These changes aren't + significant to the purpose of the patch.] + Signed-off-by: Ricardo Cañuelo Navarro ## drivers/net/tun.c ## @@ drivers/net/tun.c: static struct sk_buff *tun_build_skb(struct tun_struct *tun, @@ drivers/net/tun.c: static int tun_sendmsg(struct socket *sock, struct msghdr *m, ## net/core/dev.c ## @@ net/core/dev.c: static DEFINE_STATIC_KEY_FALSE(generic_xdp_needed_key); - int do_xdp_generic(struct bpf_prog *xdp_prog, struct sk_buff **pskb) + int do_xdp_generic(struct bpf_prog *xdp_prog, struct sk_buff *skb) { + struct bpf_net_context __bpf_net_ctx, *bpf_net_ctx; + @@ net/core/dev.c: static DEFINE_STATIC_KEY_FALSE(generic_xdp_needed_key); int err; + bpf_net_ctx = bpf_net_ctx_set(&__bpf_net_ctx); - act = netif_receive_generic_xdp(pskb, &xdp, xdp_prog); + act = netif_receive_generic_xdp(skb, &xdp, xdp_prog); if (act != XDP_PASS) { switch (act) { -@@ net/core/dev.c: int do_xdp_generic(struct bpf_prog *xdp_prog, struct sk_buff **pskb) - generic_xdp_tx(*pskb, xdp_prog); +@@ net/core/dev.c: int do_xdp_generic(struct bpf_prog *xdp_prog, struct sk_buff *skb) + generic_xdp_tx(skb, xdp_prog); break; } + bpf_net_ctx_clear(bpf_net_ctx); @@ net/core/dev.c: int do_xdp_generic(struct bpf_prog *xdp_prog, struct sk_buff **p return XDP_PASS; out_redir: + bpf_net_ctx_clear(bpf_net_ctx); - kfree_skb_reason(*pskb, SKB_DROP_REASON_XDP); + kfree_skb_reason(skb, SKB_DROP_REASON_XDP); return XDP_DROP; } --- NOTE: These results are for this patch alone. Full series testing will be performed when all parts are received. Results of testing on various branches: | Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.6.y | Success | Success |