From nobody Thu Apr 2 02:43:20 2026 Received: from mail-qk1-f225.google.com (mail-qk1-f225.google.com [209.85.222.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A68A03115B8 for ; Thu, 26 Feb 2026 04:00:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.225 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772078445; cv=none; b=Drl/IrPnCgeXUJandMh/kGRjjNr2DvKdHbFGgxPaFu69rQukA8++2jAmX+7Cq4m3TsMAgWP4HycYrO3Xxzv+6yc3qyjU/7v977U97q82GdXoyCZ0/sWSKmVcfTULIkPab6X908go179isx2FEbrVpQ7928YEzsmTxSuDR5uJfXE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772078445; c=relaxed/simple; bh=OCwdj7Oh5C+efhQCrlN1d+zmPFTrH4fhSIEXXLkQ4sM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=YhfTBRXAutY0E2KVw+bwNeb/yoHQ29bJZDD8RQwZQS2q6ZS+Kamg0BYAv027H9wqmcWAgsyElWq/VKOJ/pQxaiN09lXeteeLZl09cMhCDAPCMjcHg8u3B5AXfpzhQ4JvyGVltp4xn08YX2qGU3LX25o7UVHSBNPbFyHz2xBF0OQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=BYHD/+Fy; arc=none smtp.client-ip=209.85.222.225 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="BYHD/+Fy" Received: by mail-qk1-f225.google.com with SMTP id af79cd13be357-8cb403b7c75so897585a.2 for ; Wed, 25 Feb 2026 20:00:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772078442; x=1772683242; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ygNO1gCaOojuV3uvydJE9/w7V+rMBG5fJx8eoEfJcQI=; b=N0BbZ8CUbl2duWCg3ygHDiktXXot9a8cAkKHuQhzHpOq3cNhHTlFyqh77TkNAEnthK y2il0s21uRdA9WHDQL8GGnE8hvnKe4rrPD6ArSp1FCwrs3A8MlBw9ewS7CN6Do0RMoa3 jD2YO/kLdMLZ+umGfgbYXeXHeQZszaCZ96x0gzruROOj/cBoz0T8/vdBMMTWQOIu7STs xz24c4U26oM+jA0zIDUCn2YlEICFEiRx1np/QJOkd6lC/rXFmjEUQntXQus2aqcTUFig ncc8XINw/GTlNoJ8iWRLrMVXVewQwOiQ3BqIeJ974fSAquq7Dx42XGX7//6HagCZhVf1 3b4w== X-Forwarded-Encrypted: i=1; AJvYcCVG6cAhlSA5kpBCG1pAE6kSi4qxbVKyQITS/UBXC/RGrpSyjaxUJdqiY1xDI4aSTc1C1/zVCt09K0gpB3M=@vger.kernel.org X-Gm-Message-State: AOJu0Ywnzt5ef+IaGJoUq4XaftodeHAJqoWoDzpx7220xhuFebXCjN5z gTWTvlCGLjEXqIXuDOsj2+s8SzDwdh3Rmwz73D/MuQSQaDNG/1hNMuVXAkMBxRwfwNdSkddJ7Hd X2w84drpjWhnXCAim5gOXJyYRAFjpayAusY0nnyyzZ5kPKL77OOCCXP0WUcAZMp6lsl3zBAKxkQ Ht5Z/ABohRLR/fEUlbI4c74lPmLB9OMKZmvwDmJU/9lStvB7Kw4O43APu8GEP/QCgF6IilI8Kr3 lWD1HAbzhVLTl5Cby1iRbVHpGD/SJJDi1fmY/w= X-Gm-Gg: ATEYQzyqGlY6qX9NIBVX5D3OZPO1CcDt3YaJc6UxkzRTkzmQIZ7DlX83bUTC2sFauNx hEFPhQW/MKZZ7FYbkDtSB428J2I5v7UUXrKvsOkusMCJppn+9W+i9oi9sLlur2Ei4F/kx6jcl0i BLemZNIZYX5JSwJBQiMdrPaUHaR3nGGkX5KNjAuO0lshmb/R2noYiEeDdGYgsaCWvJjaAdjiat/ OmmRHxf6pNrbb6V56LJ7E5xuhmS1seCnJPOQPCn/BiMVci4d4l+5hM2Rf/RsmPVZsH0CXopBMpe bmOgRNq9vuyNJXi+/HgmtRyCSOEgxUsAUwOx+Imf9heGeYCQVAOSHWrtlmw6ljcDQrTmena1JbA 1veZKYUMLehouVQRro6npw5LAj0meg/kqaUzeN1aXUzMOahh0LTXC4HPTFFPhAsmIuVhw6MjehS x0+PWPqJNGOddDx9pLKEcSV4NqM8fDgl0hGmyTq/g/X6CEKRv2VbCQ1SRxqMwqCS/2mRL3PUqeE A== X-Received: by 2002:a05:6214:4e83:b0:899:555c:cb2a with SMTP id 6a1803df08f44-89979d42cadmr191521866d6.3.1772078442562; Wed, 25 Feb 2026 20:00:42 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-95.dlp.protect.broadcom.com. [144.49.247.95]) by smtp-relay.gmail.com with ESMTPS id 6a1803df08f44-899c735fcd1sm803726d6.27.2026.02.25.20.00.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Feb 2026 20:00:42 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-8954937be97so5114676d6.1 for ; Wed, 25 Feb 2026 20:00:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1772078440; x=1772683240; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ygNO1gCaOojuV3uvydJE9/w7V+rMBG5fJx8eoEfJcQI=; b=BYHD/+Fys3HLicSUPGqwyOzkNxW1NEyazqoJmYDBwo5HUfptM6l/Km/Z6eEuYUeQ9G Wqubx5SQlg7aN5pmTbg5k5oGgUj8nBIkTSjIhwBlnxKTG/NQzDMozkuAqFc/+YpwS4As TvQlZWmDcxKoqLPBY1czHjUOJgti3IpYrr7RA= X-Forwarded-Encrypted: i=1; AJvYcCUGnkIk1ZG5eeYtZFEaEb7e872lBjs9gLtEqzieSj0D+1s1bV3hdyVRFfVfxDSc3BueJHEnJ0CyT8wfMFA=@vger.kernel.org X-Received: by 2002:a05:6214:8011:b0:899:b749:d40b with SMTP id 6a1803df08f44-899b749d509mr48891276d6.0.1772078440533; Wed, 25 Feb 2026 20:00:40 -0800 (PST) X-Received: by 2002:a05:6214:8011:b0:899:b749:d40b with SMTP id 6a1803df08f44-899b749d509mr48890886d6.0.1772078439948; Wed, 25 Feb 2026 20:00:39 -0800 (PST) Received: from keerthanak-ph5-dev.. ([192.19.161.250]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8cbbf67814bsm118473585a.17.2026.02.25.20.00.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Feb 2026 20:00:39 -0800 (PST) From: Keerthana K To: stable@vger.kernel.org, gregkh@linuxfoundation.org Cc: davem@davemloft.net, dsahern@kernel.org, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, kafai@fb.com, weiwan@google.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, ajay.kaher@broadcom.com, alexey.makhalov@broadcom.com, vamsi-krishna.brahmajosyula@broadcom.com, yin.ding@broadcom.com, tapas.kundu@broadcom.com, Sasha Levin , Keerthana K , Shivani Agarwal Subject: [PATCH v3 v5.10-v5.15 ] ipv6: use RCU in ip6_xmit() Date: Thu, 26 Feb 2026 03:55:28 +0000 Message-ID: <20260226035528.3222150-1-keerthana.kalyanasundaram@broadcom.com> X-Mailer: git-send-email 2.43.7 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-DetectorID-Processed: b00c1d49-9d2e-4205-b15f-d015386d3d5e Content-Type: text/plain; charset="utf-8" From: Eric Dumazet [ Upstream commit 9085e56501d93af9f2d7bd16f7fcfacdde47b99c ] Use RCU in ip6_xmit() in order to use dst_dev_rcu() to prevent possible UAF. 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-4-edumazet@google.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin Signed-off-by: Keerthana K Signed-off-by: Shivani Agarwal --- Changes in v2: - None net/ipv6/ip6_output.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 426330b8d..3411da42a 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -255,33 +255,34 @@ bool ip6_autoflowlabel(struct net *net, const struct = ipv6_pinfo *np) int ip6_xmit(const struct sock *sk, struct sk_buff *skb, struct flowi6 *fl= 6, __u32 mark, struct ipv6_txoptions *opt, int tclass, u32 priority) { - struct net *net =3D sock_net(sk); const struct ipv6_pinfo *np =3D inet6_sk(sk); struct in6_addr *first_hop =3D &fl6->daddr; struct dst_entry *dst =3D skb_dst(skb); - struct net_device *dev =3D dst->dev; struct inet6_dev *idev =3D ip6_dst_idev(dst); + struct net *net =3D sock_net(sk); unsigned int head_room; + struct net_device *dev; struct ipv6hdr *hdr; u8 proto =3D fl6->flowi6_proto; int seg_len =3D skb->len; - int hlimit =3D -1; + int ret, hlimit =3D -1; u32 mtu; =20 + rcu_read_lock(); + + dev =3D dst_dev_rcu(dst); head_room =3D sizeof(struct ipv6hdr) + LL_RESERVED_SPACE(dev); if (opt) head_room +=3D opt->opt_nflen + opt->opt_flen; =20 if (unlikely(head_room > skb_headroom(skb))) { - /* Make sure idev stays alive */ - rcu_read_lock(); + /* idev stays alive while we hold rcu_read_lock(). */ skb =3D skb_expand_head(skb, head_room); if (!skb) { IP6_INC_STATS(net, idev, IPSTATS_MIB_OUTDISCARDS); - rcu_read_unlock(); - return -ENOBUFS; + ret =3D -ENOBUFS; + goto unlock; } - rcu_read_unlock(); } =20 if (opt) { @@ -329,17 +330,21 @@ int ip6_xmit(const struct sock *sk, struct sk_buff *s= kb, struct flowi6 *fl6, * skb to its handler for processing */ skb =3D l3mdev_ip6_out((struct sock *)sk, skb); - if (unlikely(!skb)) - return 0; + if (unlikely(!skb)) { + ret =3D 0; + goto unlock; + } =20 /* hooks should never assume socket lock is held. * we promote our socket to non const */ - return NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, - net, (struct sock *)sk, skb, NULL, dev, - dst_output); + ret =3D NF_HOOK(NFPROTO_IPV6, NF_INET_LOCAL_OUT, + net, (struct sock *)sk, skb, NULL, dev, + dst_output); + goto unlock; } =20 + ret =3D -EMSGSIZE; skb->dev =3D dev; /* ipv6_local_error() does not require socket lock, * we promote our socket to non const @@ -348,7 +353,9 @@ int ip6_xmit(const struct sock *sk, struct sk_buff *skb= , struct flowi6 *fl6, =20 IP6_INC_STATS(net, idev, IPSTATS_MIB_FRAGFAILS); kfree_skb(skb); - return -EMSGSIZE; +unlock: + rcu_read_unlock(); + return ret; } EXPORT_SYMBOL(ip6_xmit); =20 --=20 2.40.4