From nobody Tue Apr 7 14:06:31 2026 Received: from mail-yx1-f100.google.com (mail-yx1-f100.google.com [74.125.224.100]) (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 2BBF530F927 for ; Thu, 26 Feb 2026 04:00:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772078405; cv=none; b=nGtcCzJ2Tv2/tBtb0BEmeZ9msIZQvuB6vMPbCBhk5+rBZF0zwlM+hrHBkGyNvAcoC1W1XNXxF1hXBXMRUWRB1MPiynxKH5q/f5qFVW5bj12S+v7pQZCcrvDOU7w7FwhW89iZd6X9YgLWPgC9vtiHTIMBj8sn6oB7cy6JZXGRTF0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772078405; c=relaxed/simple; bh=yUL8W7q3973HgXkMv9YNfI6lkImeogNMi/pAL3ytizw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=qFWsxJG8TaaoBeLQOg/43sfCRnobMB5kQSPFMtmeEV8IxTecvklAPGz5gv0xDmLmYV09cBF0S3N2/6usBZBaPNKZZiO6u1LYD5v5cwUFlyFgmTjx6Iv18IDZDGBxC6hBLvMg1z34TbkIGMC6rilaxzj4WAHECw5AnYPgKsZGQw8= 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=A+zqachk; arc=none smtp.client-ip=74.125.224.100 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="A+zqachk" Received: by mail-yx1-f100.google.com with SMTP id 956f58d0204a3-64ae58222aaso54919d50.1 for ; Wed, 25 Feb 2026 20:00:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772078403; x=1772683203; 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=i2vekJc+TZLbqZ8ynAz/dWVNNz4zBmku0WGBUmEYr8g=; b=GQHeouA8G5oJaHTKeqC4mckd6N41qnRnlvVr6ck8t7T6oHuo4KnoHqVnqpb6UaIZrh WahAPTj55R/nAMKbjyj8Bd4bAu8CkADTPBn8ooKSIL+WTuSAI2ySNbcI/GSf2g0+MXzz Q6v2ftJBxwaMdRsxbuiCHskRv1JDkva2mTcdmH76Qe4QQ3yTXo+jvYe2O+phSGvSfd4B kEJm/AwH+1qnJBnTn2AhoF8IorB4vX4w5JF+AeehJ9mtnDfYwp2TSffKWhb176i8NCBo o+AX4g8gbtaI5LB+kWf+40dbCwG6VTtpQsjHWi/+Lw3JCzpVGNnjgJnHPbXv4+fC8/qN gDOQ== X-Forwarded-Encrypted: i=1; AJvYcCWlwlxZVjwCW4re16UqtnQCI2I/lKkQq97GZKCv8m7kweFmkHu7wbqCXvh+VvBqhSPR90XnGaHY8WFHcUs=@vger.kernel.org X-Gm-Message-State: AOJu0YwV2w/XZRhgT3O2WwwE98K9J/Pxq5L6CoxaN1Co4LfSKGeJPR9U xPcZvu68YwMExtwzY3gOSmgtBc1gDqVwh6R3M2rGOu/rLZQfIxvQ2yIbon2pNTef3bmc4fouQac cRvhO6sxjSWD03/MzSaH56efXo0sdemGT/k+1nNdgEZjMR6RaA8d+Fg+NS0J1419eLetT4b1zsu bmsn3obpEvi0pL/TvT+rFbe6KTf38ZdImHF2Eb/ineCogwgyOoYiorzLBIY0VA+Bc/IZ10lLJrV 0q2tUF9xMwh7QZO1zDKIW/sB06twjkgCQd85f4= X-Gm-Gg: ATEYQzzWj/KTY3QCRKc4ClXbpHI9G495+ZI5vUvZjTYVcYzjnT2y56pJIjbSLg1hM6i ZOmC5Ar38wIAcBcyRMfI93ceDKUmezOUUOfXqKayGS2YM2oFfsSzA/ZTzigcfXL4z8I9D+kUTyQ EfdAkgAKdbN6GOEfk6TRcES7cc0WHppca1+SKQkRxC6eKbbwKoluoDeErroMBSElvU/kLtIeAYQ pEF/wSEg73TJyPAjx2XHwC6u9MJ3IJebswZLWKrrECFzbOZGEktw2ZCAeh5LvfM1CHfH8dnS9rV xQ2OVtAQHbHGpZglH2eavoTkmEuJF297M8N+4CCEKpXFVwgnj1yvbFONyuq7BWYxTxPOdSdsa/n Hs2S6lwc6CdiwUV1R9gT+boDmCBWeWiX0BpNqauRNKQOeWI3PlHTmcPApsCog6Ae7RHZQ9fuSs3 8WJnyaiLIFzH3GNWNQLjfgLk4ekVx+68HowIQrNb4rp3koaj5rFMxCc6AR9c1noQtIalefAZLpA g== X-Received: by 2002:a05:690e:1385:b0:649:daba:4e68 with SMTP id 956f58d0204a3-64c790a5dabmr13364045d50.7.1772078402941; Wed, 25 Feb 2026 20:00:02 -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 956f58d0204a3-64cb760ec85sm89146d50.12.2026.02.25.20.00.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Feb 2026 20:00:02 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-506a633ce06so4544741cf.3 for ; Wed, 25 Feb 2026 20:00:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1772078402; x=1772683202; 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=i2vekJc+TZLbqZ8ynAz/dWVNNz4zBmku0WGBUmEYr8g=; b=A+zqachk6matRI+5fpEXHmXfKlrqdfM2yLcDcfZrVAJlykTS3cBbzB1kRSoKbOpV6v +yqH1rukCpOspQEFGDe8Lrz7Ke8VEn3dyDcJI1ROQInOKpHQgOsaGO6kvQuw/oPhRe8x 8MKBnPVhwJmqiIpj2phFecaTOQUYifxQLDA5c= X-Forwarded-Encrypted: i=1; AJvYcCX8w/Rj1/ZY3tis7JDpLGz8MHH0kGan2drRn2QiahT6p9E57mBqpUsksWemzqj0Ki1WNiIS0WFtMDI12f8=@vger.kernel.org X-Received: by 2002:a05:622a:34d:b0:502:a1bb:632a with SMTP id d75a77b69052e-5070ba7b201mr197204541cf.0.1772078402124; Wed, 25 Feb 2026 20:00:02 -0800 (PST) X-Received: by 2002:a05:622a:34d:b0:502:a1bb:632a with SMTP id d75a77b69052e-5070ba7b201mr197204271cf.0.1772078401594; Wed, 25 Feb 2026 20:00:01 -0800 (PST) Received: from keerthanak-ph5-dev.. ([192.19.161.250]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-5074496300fsm10415161cf.2.2026.02.25.19.59.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Feb 2026 20:00:00 -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 v6.12] ipv6: use RCU in ip6_xmit() Date: Thu, 26 Feb 2026 03:54:49 +0000 Message-ID: <20260226035449.3222120-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 v3: - Updated authors 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