From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 297CE48E0D0 for ; Tue, 8 Sep 2026 19:28:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788895723; cv=none; b=czRKI0jrDq8+MisRhnL2fqp5XU57lJ3R/xgbDhk+8TgKhj75epHpqBfkiwTjLjH1/9RtkvXGK6h9d1WhqdgTQiiurwHd43782TK7d4QMARTKPR+r4E7dyRfphV6t4pfruM+DeNPoQ7CpBwg+4K9v/xS9QTiMLgGJJdDeSgmIPkA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788895723; c=relaxed/simple; bh=3tMcT998QZrFv09yR5cjwZBhrc8pAzhOjhzcbVAKz0U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Z1c3LiLxLhOMMf4gCvAMM1ttDFHIjYbNpfZ5rwA9yWxCUeDmpTWfEZ2f/SNomVUj6wSnVnqT0hyg5OXSPiMCJXpHXzkeZR/a12HIAmbnjVQhNgc6ZbhIS6YKuHuVxBqitpMSWNU+FpUe3APMw4C/rNOnoT0pPTyeyb1O6nGUf/A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=M0BTGU/T; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="M0BTGU/T" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 674581F00ACF; Tue, 8 Sep 2026 19:28:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1788895715; bh=crpqPHN0+cMmMHjaOWOffv20skx3aBPUFY/pGlNem8s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=M0BTGU/TuFfah2J8HM7jdSGss3TwliEtJw/Gm57DnDcziS4hzEnicg3aml2DKvqMH UoNCAaBkkftQuBijy1ncRbUJLnPr1JISXZs7KbLw94c7aHEiBPsRIeroyTdDJOUVlN VSjbMruVGJ6bjNDh9OKUTDeNFK8ojn1veTK28/XGhqJbRxHfXcWCOd/+YxKlNtpvh8 uraezHeSM5rs9EP8y0y/AMlcZqBGr2E+NMOjGA99/ENFbwf3IL8MsG8ckON9SVpBWf c4wenL0QICz2VxZMEtpkRJrh+ENrnFYQhziRIck/MO71Yp/eTbwPLa+9qG63su1LjL 9jE/NDGbaMb0w== From: Sasha Levin To: stable@vger.kernel.org Cc: Zhiling Zou , Vega , Ido Schimmel , Paolo Abeni , Sasha Levin Subject: [PATCH 6.6.y 3/3] ip: orphan prefetched skbs before multicast forwarding Date: Tue, 8 Sep 2026 15:28:31 -0400 Message-ID: <20260908192831.296595-3-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260908192831.296595-1-sashal@kernel.org> References: <2026090318-pusher-lucid-87ba@gregkh> <20260908192831.296595-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Zhiling Zou [ Upstream commit e36ce6e78fe3fc3c071a26750783b7ba081ce10d ] IPv4 and IPv6 input preserve an skb->sk association installed by bpf_sk_assign() so that local delivery can use the selected socket under RCU. Both address families can also prefetch a socket in UDP early demux. In both paths (BPF and UDP early demux) a reference is not guaranteed to be held on the socket. When a multicast packet is not locally deliverable, IPv6 hands the original skb to ip6_mr_input(). IPv4's ip_mr_input() similarly keeps the original skb when local delivery is not needed. Either path can put the skb on an unresolved multicast route queue or forward it after the receive-side RCU section ends. After the prefetched socket is destroyed, a later skb free invokes sock_pfree() and dereferences the stale skb->sk. Orphan the skb before each non-local multicast forwarding path. Local delivery retains the original skb; the existing skb_clone() calls provide multicast forwarding with a socket-free clone. Fixes: cf7fbe660f2d ("bpf: Add socket assign support") Fixes: 08842c43d016 ("udp: no longer touch sk->sk_refcnt in early demux") Cc: stable@vger.kernel.org Reported-by: Vega Signed-off-by: Zhiling Zou Reported-by: Vega Signed-off-by: Zhiling Zou Reviewed-by: Ido Schimmel Link: https://patch.msgid.link/0c52eb3d7532aaf8bccf37e0f7c922143c639735.1786552223.git.zhilinz@nebusec.ai Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- net/ipv4/ipmr.c | 3 +++ net/ipv6/ip6_input.c | 1 + 2 files changed, 4 insertions(+) diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index af9412a507cf3..93d08e343a256 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -2139,6 +2139,9 @@ int ip_mr_input(struct sk_buff *skb) if (IPCB(skb)->flags & IPSKB_FORWARDED) goto dont_forward; + if (!local) + skb_orphan(skb); + mrt = ipmr_rt_fib_lookup(net, skb); if (IS_ERR(mrt)) { kfree_skb(skb); diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c index e775a5a766692..9b6eaae0c6c80 100644 --- a/net/ipv6/ip6_input.c +++ b/net/ipv6/ip6_input.c @@ -566,6 +566,7 @@ int ip6_mc_input(struct sk_buff *skb) if (deliver) { skb2 = skb_clone(skb, GFP_ATOMIC); } else { + skb_orphan(skb); skb2 = skb; skb = NULL; } -- 2.53.0