From nobody Fri Apr 17 06:17:28 2026 Received: from mail-pf1-f225.google.com (mail-pf1-f225.google.com [209.85.210.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 E167B35DD1C for ; Mon, 23 Feb 2026 11:23:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.225 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771845822; cv=none; b=Nn1O3HKZCiHX/HYXrIMRv3ceRyKzz2NTLpFBM9vzZRe1VoJu1TzbxPRQ1TsTzClcwyv1uu6RtFO7atmUYjINoSlr4+q/wwMildzf40Z0Xy7EU2hA5ML+BWiooM2kloRBFd8v4wZMy71CfOEhp9jNWCuocUISBk1DHjVX0DMf7pY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771845822; c=relaxed/simple; bh=lvTW1+OHeoqBwGRfC687Y/+rOdge+5sxdrNLssMANaI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=g72tw/RKD5ymERcTkb3qNwNkaWKkY9PCPsxrE2aChpUqTraQsmf6eEKZ/NECE5kgX/y66mxZNBk3t6K7S6Qw6kxpxZ2lqqFhBMxpa9iiFffF/FMBqa5j5VzwH+MLXfLYSSwmrW0+dz5GkkGy/i40ShAAjqxRHS6DHNd/Wlxn09Q= 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=WYfSxzD9; arc=none smtp.client-ip=209.85.210.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="WYfSxzD9" Received: by mail-pf1-f225.google.com with SMTP id d2e1a72fcca58-824bcb2011bso126672b3a.3 for ; Mon, 23 Feb 2026 03:23:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771845820; x=1772450620; 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=vCb3mGAPKai1Hpobl7lKadHZ3M3yFOIt6q/w7eisnl8=; b=mZ7+3VciC+I/WozIdojQrq+MWLMYx8BxfN6blUhUbnBxJ/VNG+nI8kKIdK4TnbbFdU PVHiEn25TCGL8DeJOXDk8oEnnFLFAH8J3//n72JSEo7zNlcX6abFNvk97t6ElFR/vg8r FCeympdRCMTZk8/x338AlLfv+r7SWoR/MspCyOzJ0ec4UC9TW1DfhhubIl9pdCo2/ntE B6gCpCxcOJLwiDNl2C26W//cNIYwTIi8cQfT8bTUqcqQKXvAe2qJ0Z1B6FRlfpluYGtg qCKigDFLddmft9MsNIClb4eVM1K8CRzGpvwjdEuZmbePaAHxZ3Cww4RUgZ583Df6Bfqp Ubyw== X-Forwarded-Encrypted: i=1; AJvYcCWUsSAoIU0YcLp9YXyP6M2xwvd/GIC3J1m57VDcsMHbzfQxuCBPANzDQhdQp0FOl//A4a7SEXhIx0aZ3uM=@vger.kernel.org X-Gm-Message-State: AOJu0YxeBt4kr2MmlqP1RKTxCNBWI+hbbGn+xdJFjImPYxSOWkNs/8RQ VwZqn7TU+HNLHD47jKGl+VieUvTgLF6t0rcbW9tvqp3tKG1zOIrnUzr/lc3SLsA/40yar2q31iF rexkiDC+SaG2P0cQc1LnQF3StYMDVy0CsTrX8P4V0K723GlQVy13z6bkRg8g+nFrKn9DJjEpnad f28P8+9jabGqefs2XotvRLkBL8TVbcVEng6kEulp41eWFn6BHpfsLW2pyTnAiGJ9iINQoa2kk8Y oLPnbig5z9xvJH6VhdYzHNPhRo4vQvCT+Z1NV4= X-Gm-Gg: AZuq6aLPZX5sLuYYNH1fMpEt3DfSOtJwNdOstzAalRdACSztnRVM47DGFjrfWKJoCKT C/AUvr1/G8LtY98fOiP9AJOKu3slR+n//Y8M/nRMnnNTRvkbl8E71bBQ2Y+qBbzLUzxIN2klaX1 xD3pEpx1DGqX5TE/Few5ZI6fuW5E7PZvC9KT3ijUUwHyxOSkD/CBpgrtzB/ah47IPbruuCQQNj9 nIm4q0PmvFhANwlTZzMsU4m/e0HU7xdGcIUNRul8Ew9/sDmEwTmOBLWEEwzMZM+avzBaC2oLpmM HBQhazYhSjY8VnAk7C7wFBGEKoIVr/3y54mSGCAyvh+XyXbOIYAj2ARCECOPPqB5yh2hQ4sMpge g0VVMQzlxlYEHxsSgRDXTRcmOV31nYFhs8NXh9Fz3UCWmAPeqDtNwZ5BoKOoyMapeZQwCeDvh0e UM0MQdRl9bW1ydUDLrkV/pVdydoKFLMEgwa9M1F+tP6FjfBrJtf9nUJAKsCv4cRmy9rLUUVEzTC q4C X-Received: by 2002:a05:6a00:2354:b0:824:91f5:aa2d with SMTP id d2e1a72fcca58-826daa6725emr3898511b3a.5.1771845820212; Mon, 23 Feb 2026 03:23:40 -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 d2e1a72fcca58-826dd811b3csm881679b3a.4.2026.02.23.03.23.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Feb 2026 03:23:40 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-qt1-f199.google.com with SMTP id d75a77b69052e-506a633ce06so56470111cf.3 for ; Mon, 23 Feb 2026 03:23:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1771845819; x=1772450619; 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=vCb3mGAPKai1Hpobl7lKadHZ3M3yFOIt6q/w7eisnl8=; b=WYfSxzD9NnFJRZmYfaFZ3t8C0UTmSfIhB4+DORLfNh8M7uJMxwG8X6Vo44/KrOal1g h1DQC//mPiYOMZWiElU/Q+B72Wp21GKd172Z86L55a6KDAJ1HE8ZqS0Qk1VwyU4ImQO4 t6xO9PAzrDJbo0ss0/c6oX+achzDKlkvcY3HI= X-Forwarded-Encrypted: i=1; AJvYcCWhMe90GBpuII4v/4A8cNuGyaXpdsh+3fIBHQz8ew/QG/S4Y+3zLQzX5iepZA7C1t8vZfih+b8bH79tZl8=@vger.kernel.org X-Received: by 2002:a05:622a:1990:b0:4f1:b3c1:20f8 with SMTP id d75a77b69052e-5070bbd7824mr89593801cf.4.1771845818643; Mon, 23 Feb 2026 03:23:38 -0800 (PST) X-Received: by 2002:a05:622a:1990:b0:4f1:b3c1:20f8 with SMTP id d75a77b69052e-5070bbd7824mr89593571cf.4.1771845818162; Mon, 23 Feb 2026 03:23:38 -0800 (PST) Received: from keerthanak-ph5-dev.. ([192.19.161.250]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8cb8d059502sm685245285a.11.2026.02.23.03.23.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Feb 2026 03:23:37 -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.1-v6.6] ipv6: use RCU in ip6_xmit() Date: Mon, 23 Feb 2026 11:18:34 +0000 Message-ID: <20260223111834.4165169-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: - 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 f7a225da8525..4ea4da0e71c9 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -258,35 +258,36 @@ 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 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) { @@ -348,17 +349,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 @@ -367,7 +372,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