From nobody Fri Apr 17 06:17:28 2026 Received: from mail-dy1-f227.google.com (mail-dy1-f227.google.com [74.125.82.227]) (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 B83B734E75E for ; Mon, 23 Feb 2026 11:23:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.227 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771845840; cv=none; b=Pp5ufyC8H0xXsTgbbcoRh2J9RpvSHrUa8ncGahuXb3HpPSWSsa+7DSNLHIL5s9o69Dxc5qVNNnCFxhsbLttsX2oxMBcOMhQi02rbwZRY86zN1uNzSxGPKh8bAG0yNDcHU0CxufnixeWmh+GzSqOTWXFx8Lx9tBwuxG+cfqYUGpg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771845840; c=relaxed/simple; bh=JPgultTIWgbNYxA4vXArnqWlMkM/RR4GlNiyDYUXKLU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=fObEI8GyIpYt/hCUU5sFc+RF3B8376BJsNKJfXwwWp52c8KWgpGWFRQE0JZuupbU8gsig0IZq09AUGAI86sQ2cQM0l8kxDbc9qQ6Cm7bHn0D+X7gJQEx1D45R7aZ8pMdqUeD/xaVBzzbrsMpCi8G7xLrzsTSMf3QjxMQeZXeCkk= 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=Q2lb2ihs; arc=none smtp.client-ip=74.125.82.227 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="Q2lb2ihs" Received: by mail-dy1-f227.google.com with SMTP id 5a478bee46e88-2b8095668ebso275455eec.2 for ; Mon, 23 Feb 2026 03:23:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771845837; x=1772450637; 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=C9EWl9Y2Ycs1HrHu15KRF0sV4Ewn7s/wLLI95hZv0i4=; b=QcnU0I0Ho7eCb1WWgMIa9j4L5YUHLnlMPhvfJhheUBHVon5fe9KPiBiCu5/HCfhTt7 wg7MkoxYj/NYJALwf0ufOghChwpMczTPZVbLZH/i1A8nbsfmdQiYaydcRz3PuRDiKtlH PArGGyScv/B7WfBqpC9APBP7MVI26ypdTdJmB44LJ2YPGJ/yEBoD210Ee5dTMjUWOiNI JxGitntktl3mBeyeyDiwtFFfonTAByh/WiQoLOnxIg7pBl7ZqgHqCn0NUlreZ1DVtJRr nkdiH/iU9XEL3utnXpNkFxcKKasHjlilnotTUzBC48LPZlCb/Xo8+3dddk/hJJlFkAbF AVgw== X-Forwarded-Encrypted: i=1; AJvYcCWpjUriqk5wY6NJDwc5Kc8lrCOJgtNNQolaujSz63lrLhoNdQS5dou3jpERjLgbAv7ey1G3sYMX+CEjOwc=@vger.kernel.org X-Gm-Message-State: AOJu0Yx66Il3/KhEFiLl/YMVyV14j9WKN2SF1DAY40eXtaYHTKsKU+2n YQ9sKVGBC0I6k9bRRdIJYGWFLz/7WubvMMpQNU1q4bN58VCwgePYNOq6DD6ZQJq9PkGYL+MW4mz q/TviyjKieekQjigv8Kb7gVyNIeG90PmRd1oIgV7z+3p0leemCSrsKwZsBwMzyPek2wXW+/EyB0 woCSZqSBN+QrlNQixxtmBwrc4Fyo7OUka56dzHXW7Isa26YBRgTNnkMf573+A63lb5DXOkFtwz6 u9aM68TjPqo1LaY7RpPb9Vd0X3NESre3gvq X-Gm-Gg: ATEYQzy981wBENXIpiCncoO3schILjq4FUX96Qc4d/Vo2asKPIV7RXiLhTGFueFVQeL o6ca3/ZFpw3EUuU1pBQlN6YtWdmnVvDTzhV1DBBokSv1tB/2iLDtHzCW/dAfGO3gFcF4wKO9qCP xhpc1D9m2op+0G70f7atTTJRH1EFXay6WGMaS5ucL04V5ILgMMpNQh9SWs/YwrUi3jiRlpPKJcN U2/dyGKMU8CTc6BUHvyC7O0Bv7ablgOshryOl9v6T/0BlTJkerIQmR/85lh+44VBXnLBivqyD27 GlQAyyYS+x+vjyLgZbQGWbxNlQEQSr4f10ET+mvfMziRsD4Ov4wo2Fjgp2fTY0C2IbyowCDX4gp vmtWlKAT+HOL1z6DJ3xfzi+4qRJa8tOxnlKELktHjl7gotqCU2iYTJffe8b1B71IB6WD/ehinhU +U7GwMzi8BOq/fOyu+8BPo0i6okzeRPZbh6qc2JhD5Czum0GgZ5udmJAt3Djql9h+cA0YtH83LU 951 X-Received: by 2002:a05:7301:3e09:b0:2ba:7d2c:1468 with SMTP id 5a478bee46e88-2bd7bdb1e3cmr1621958eec.8.1771845836688; Mon, 23 Feb 2026 03:23:56 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-117.dlp.protect.broadcom.com. [144.49.247.117]) by smtp-relay.gmail.com with ESMTPS id a92af1059eb24-1276af588cdsm997964c88.4.2026.02.23.03.23.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Feb 2026 03:23:56 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-895375da74bso46814586d6.0 for ; Mon, 23 Feb 2026 03:23:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1771845835; x=1772450635; 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=C9EWl9Y2Ycs1HrHu15KRF0sV4Ewn7s/wLLI95hZv0i4=; b=Q2lb2ihssqbq6RlsYb0F/fBARy8lHelBo04AIS1+osNQR0AJBBfbGcRfdnu+eJUcEY Zy37Wa8DL+zO6fyDJanKNJMUuaSie0kAk/voTgMDNI4pyWlbnVZOPzYzP3UoilYN+zOH XsaYlfP+zN4F1wSD7RS+VCfo8DC65ZsR5mxIM= X-Forwarded-Encrypted: i=1; AJvYcCWZmScjiq65opVBVpQfNSeAaE76fv/w1ec5z/TxA6mQDBsFbq9ZPC8PbHfWquqRTT3G0pS6IpPkrhgvUD4=@vger.kernel.org X-Received: by 2002:a05:6214:4f1a:b0:897:1d50:2336 with SMTP id 6a1803df08f44-89979d74070mr82436516d6.6.1771845835393; Mon, 23 Feb 2026 03:23:55 -0800 (PST) X-Received: by 2002:a05:6214:4f1a:b0:897:1d50:2336 with SMTP id 6a1803df08f44-89979d74070mr82436216d6.6.1771845834866; Mon, 23 Feb 2026 03:23:54 -0800 (PST) Received: from keerthanak-ph5-dev.. ([192.19.161.250]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8cb8d1224f6sm682922385a.46.2026.02.23.03.23.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Feb 2026 03:23:54 -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 Subject: [PATCH v2 v6.12] ipv6: use RCU in ip6_xmit() Date: Mon, 23 Feb 2026 11:18:50 +0000 Message-ID: <20260223111850.4165186-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 --- Changes in v2: - Modified to apply on latest v6.12.y 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 24b68e996..0aedb2007 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -267,35 +267,36 @@ bool ip6_autoflowlabel(struct net *net, const struct = sock *sk) 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(dst); struct inet6_dev *idev =3D ip6_dst_idev(dst); struct hop_jumbo_hdr *hop_jumbo; int hoplen =3D sizeof(*hop_jumbo); + 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) + hoplen + 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) { @@ -357,17 +358,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 @@ -376,7 +381,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.43.7