From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795051621; b=s6CTOKmblvav2TX2h544REvpPPB8N91Fsyl9glguNJOQmMPqQiEHi2IIyk6Ybc8Xd3UE WfYwQs3uZqDDaLuhLL8PJhYzdB7mkvLM9bCBPwXKTmG7itw7VnFWCA3uEo1VC6qpkUe2k ptaqV6diygIQnolic8+L6FOGLunh6HdU8hB5XtbeABCBYSjLdLtH74XhESWZ7uTM+zctY vMk01jaOkxJGMb7FGAL8ZP3585O/f+rHFjNn+xstHRQthUrQfe2Onav3avfWHRFwDQ5Nl yeMjjLhibQzuxrOUrRGavSNzxyYYzUBNTaLttmbFywAe6lR4nymXUrJgEEmqstb/j8A== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795051621; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=1XP0FlcsZ7maOSTYOQ0oPsGCUwyf+UF6dD1UN94Bshs=; b=xzQKljZ/8Fovti4WCbSY+U7BrKf2vVwTntRAaochTebQvFFrZcOwqRl/IlyEhII0S6fq C/7zZwx5JPlJG1/ExPLtVJ1b2Gmn+M4n5VG1R/fxjbqktksXdCrONkcPIEOmK4s7oqiR5 KI5a3GMoTpGsMmpSTZfu/ixIO2o9gs6MrjILPVdzQkpjIT2vl979tss246N45RNIrAoNx 5VBPzRuS7dUuKm6eTmO6LxkdlOMtaX2EXeZoXtrq+7GNJ4Ijev/JXhVX5A90L4hZsypXf wNPf5BK9TsvpS3MoXoiPhibk9BTH76BxwjM1/FVCEYxUXajyT0+02MrwFLsojuse1Sg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=JRFvdBlo; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 85503606A32A; Thu, 19 Nov 2026 01:27:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=JRFvdBlo Received: by smtp.kernel.org (Postfix) with ESMTPSA id 968FF1F000C5; Thu, 19 Nov 2026 01:27:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795051621; bh=1XP0FlcsZ7maOSTYOQ0oPsGCUwyf+UF6dD1UN94Bshs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=JRFvdBlo/ixLChonU74bJffqKqCSd55gvADlwEJ6tfoUu0NueuI9sb/uvc62K0VSi ZIEW+waW5x2ikVhvo3D0xC0x50vtgJN+d1m5Glt89w1pf+mPujv9HXQqiqrShDNLsc g6X4L7SHvT1uEj2043qhbick8ImcMEoibHmzGHMk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Eric Dumazet , David Ahern , Jakub Kicinski , Anand Khoje , Harshit Mogalapalli , Sasha Levin Subject: [PATCH 5.15 0274/2214] ipv6: use RCU in ip6_output() Date: Wed, 18 Nov 2026 15:32:30 +0100 Message-ID: <20261118150021.030435395@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Dumazet [ Upstream commit 11709573cc4e48dc34c80fc7ab9ce5b159e29695 ] Use RCU in ip6_output() in order to use dst_dev_rcu() to prevent possible UAF. We can remove rcu_read_lock()/rcu_read_unlock() pairs from ip6_finish_output2(). Fixes: 4a6ce2b6f2ec ("net: introduce a new function dst_dev_put()") Signed-off-by: Eric Dumazet Reviewed-by: David Ahern Link: https://patch.msgid.link/20250828195823.3958522-5-edumazet@google.com Signed-off-by: Jakub Kicinski (cherry picked from commit 11709573cc4e48dc34c80fc7ab9ce5b159e29695) Conflicts: - Retain 5.15 BH neighbor path, skb free API, and stable header refresh Signed-off-by: Anand Khoje Signed-off-by: Harshit Mogalapalli Signed-off-by: Sasha Levin --- net/ipv6/ip6_output.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 6db5f25017363..bc6c02918ca7c 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -59,7 +59,7 @@ static int ip6_finish_output2(struct net *net, struct sock *sk, struct sk_buff *skb) { struct dst_entry *dst = skb_dst(skb); - struct net_device *dev = dst->dev; + struct net_device *dev = dst_dev_rcu(dst); struct inet6_dev *idev = ip6_dst_idev(dst); unsigned int hh_len = LL_RESERVED_SPACE(dev); const struct in6_addr *daddr, *nexthop; @@ -69,15 +69,12 @@ static int ip6_finish_output2(struct net *net, struct sock *sk, struct sk_buff * /* Be paranoid, rather than too clever. */ if (unlikely(hh_len > skb_headroom(skb)) && dev->header_ops) { - /* Make sure idev stays alive */ - rcu_read_lock(); + /* idev stays alive because we hold rcu_read_lock(). */ skb = skb_expand_head(skb, hh_len); if (!skb) { IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTDISCARDS); - rcu_read_unlock(); return -ENOMEM; } - rcu_read_unlock(); } hdr = ipv6_hdr(skb); @@ -221,22 +218,30 @@ static int ip6_finish_output(struct net *net, struct sock *sk, struct sk_buff *s int ip6_output(struct net *net, struct sock *sk, struct sk_buff *skb) { - struct net_device *dev = skb_dst(skb)->dev, *indev = skb->dev; - struct inet6_dev *idev = ip6_dst_idev(skb_dst(skb)); + struct dst_entry *dst = skb_dst(skb); + struct net_device *dev, *indev = skb->dev; + struct inet6_dev *idev; + int ret; skb->protocol = htons(ETH_P_IPV6); + rcu_read_lock(); + dev = dst_dev_rcu(dst); + idev = ip6_dst_idev(dst); skb->dev = dev; if (unlikely(!idev || READ_ONCE(idev->cnf.disable_ipv6))) { IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTDISCARDS); + rcu_read_unlock(); kfree_skb(skb); return 0; } - return NF_HOOK_COND(NFPROTO_IPV6, NF_INET_POST_ROUTING, - net, sk, skb, indev, dev, - ip6_finish_output, - !(IP6CB(skb)->flags & IP6SKB_REROUTED)); + ret = NF_HOOK_COND(NFPROTO_IPV6, NF_INET_POST_ROUTING, + net, sk, skb, indev, dev, + ip6_finish_output, + !(IP6CB(skb)->flags & IP6SKB_REROUTED)); + rcu_read_unlock(); + return ret; } EXPORT_SYMBOL(ip6_output); -- 2.53.0