From nobody Fri Apr 17 06:17:28 2026 Received: from mail-pl1-f227.google.com (mail-pl1-f227.google.com [209.85.214.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 4CCF835CB8F for ; Mon, 23 Feb 2026 11:23:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.227 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771845786; cv=none; b=EkNpFoPoRQTUJR+OjBkhy+nwiqqrdMPBdd9J62hhK5ABSvq0j9R/0NsKOks0/3Mg4ZmnYUQnPkX0H6U1C4mH0bQLQTHMlPRu8nlevuExPtSbVZDnnklIKBlS6TC6ZPstVE+DerWtn3swvykk+IAlW4i7gyiTJ70LJUVgUGTAEBg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771845786; c=relaxed/simple; bh=OCwdj7Oh5C+efhQCrlN1d+zmPFTrH4fhSIEXXLkQ4sM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=XYqvIVIM0x9gD8f26VDJJk0Jt4yGjh0v7dNV/phNO7muPOyFyXEwOUQ50AdIj5sml3+dnjYvNFjoVWvoTLkhHuiPKNUCujikaHDDhwSHiAjWKXSpYf5KnfdMLJSbxMNdTa+fYl7mf+Ay94Rswgux4iiG0lne/SYbMjkwlsl9bo8= 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=Giec4etg; arc=none smtp.client-ip=209.85.214.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="Giec4etg" Received: by mail-pl1-f227.google.com with SMTP id d9443c01a7336-2ad2b375e58so6307875ad.3 for ; Mon, 23 Feb 2026 03:23:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771845785; x=1772450585; 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=pnto+yelSWdfVaOd1PmgvP7wyuEOCE96twzOgHXj+7ZgdsbUxe075A1n4YEavCrexC ecx0PlmZZnz9i6IZx+S2MNbrIt3w5VoPOAHVMTRe+4liZac9ePIXoVZvD8zCEgqzrxpr YzSTS+qC9FGllyVATFrjwk9V19VxLqr20AMpxoylmv1jcIp5dJ6zHKoDzGItieTqetZ/ QE3klGePMVZAELsIO+/Lx8f/JxAuynL9kXlu6ldPQLg9DneSdvRfIxihJRLnYppq7tQR e+d7a8xGaD5OMcJB9zEsDYxd1t4IsDfIcsjLJ+p4cP7brLblnBjt29ePPzsaTR/dardp sCHg== X-Forwarded-Encrypted: i=1; AJvYcCVExqCPZ4V1g7+VJUC9X3y8NPRQ/z62fZuzt0rjMRW2+fQl1hhMm3nNEFdyRpEfyZiRHXUxGGsaLwRnUi0=@vger.kernel.org X-Gm-Message-State: AOJu0YwXVZdjz2WATmfAVcexXywq0R5FUfitrRFHInhs765FgpBumPpF foaBK4sRtnmwAaxQLHVIm1sE3oPC7/v9ycLYyi6rn9drIAYeDomTn67+mpqchwLfr95PELUFeoC zvECym9LKpLFxaIpEuwFpJLOSSSdZiVzhE2DeBdA8LZNOczcY5MAfXN9TRNGoM0xJ4zSRAi6j8S Z37xuLI11yXyr1SR44Qp+uIHOvDm522JqN182FJTjRbONW8m5c+5nuX2LbONw0wlqJF+/9htPmg L3WcHs+SECiPkiJ8vqonvphAvUvtnAnWJSqGgc= X-Gm-Gg: ATEYQzzVreE9WAmEOhhzO7j0W2IydFEvBqaRb04JbsRr/kTroGh1dZSECKbcr1/MEYY fKCQvY4aOzgQ1ru2/sxetwRScySccf16BYmgqq1fdsSS60xKODT5mSSic7ew76Un7kGWNaVCfJ8 e/JRFn84KqSJOo++X/LcvRxT2Pe8+5XaZQnCs+QIZ1l/enZlfVc1D5A8NXYKr/BT8IjIhp+JN8R 9UyEiA0cdEaidK5LYgLzJeNHkoNcXv8w5vd4Hep8bwb/jBTV5TbVTKlyTtUcTrZkV1sDo13QiP9 PDSUsH0ey0KkfAbA+VztWR5+JVlOj/IDQ4YrxB23d4Px1/GA0cz05Ag4iX+EMxr5F9X6IYWZF0S UUVatHOBSPxi4OOK7irZ3RvloU0GWLRxcv4x5MWxJry36AneOp/5gsnh/Lck1Qh7x00/cXO5d8P HDaVc317UutcxbvmPnfYX6F8P7yrj4DHOv4Xr3vHTVpde3twOXczLj+4RNI67VsOxmA+2s0uKrp A== X-Received: by 2002:a17:90b:3b84:b0:352:d19c:684f with SMTP id 98e67ed59e1d1-358ae8d294dmr5434750a91.8.1771845784485; Mon, 23 Feb 2026 03:23:04 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-25.dlp.protect.broadcom.com. [144.49.247.25]) by smtp-relay.gmail.com with ESMTPS id 98e67ed59e1d1-3589d84cbdfsm1458368a91.7.2026.02.23.03.23.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Feb 2026 03:23:04 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-qv1-f71.google.com with SMTP id 6a1803df08f44-89545f12461so45860066d6.2 for ; Mon, 23 Feb 2026 03:23:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1771845781; x=1772450581; 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=Giec4etgaBfzJsz8gJhbAe8qhQrsjK5KBYgKGBPRRTCkdNCYUw37f6Ob1iiauNYSiF zwmRYKO8hL2eebPBwBSvHWqTn1A4s0s8Jt6P0UR1A8yjQDTsDKZQy6EEqFunNhoISD0C WBogVR7HFL0kyv1PgXjGCS3zMa5okgz8lCLWs= X-Forwarded-Encrypted: i=1; AJvYcCWxdAodv3LUEyl67atHXxGpRDq0EvGgd3WUoSqZcAMMsNKBMsKLz4P8pnAQTYOo5UQkIRzS6YgbrtNdiSM=@vger.kernel.org X-Received: by 2002:a05:6214:4c8a:b0:897:3f5:6a9a with SMTP id 6a1803df08f44-89979df1e45mr83323526d6.6.1771845781500; Mon, 23 Feb 2026 03:23:01 -0800 (PST) X-Received: by 2002:a05:6214:4c8a:b0:897:3f5:6a9a with SMTP id 6a1803df08f44-89979df1e45mr83323186d6.6.1771845780975; Mon, 23 Feb 2026 03:23:00 -0800 (PST) Received: from keerthanak-ph5-dev.. ([192.19.161.250]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8997e242fb8sm67106496d6.33.2026.02.23.03.22.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Feb 2026 03:23: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 v2 v5.10-v5.15 ] ipv6: use RCU in ip6_xmit() Date: Mon, 23 Feb 2026 11:17:55 +0000 Message-ID: <20260223111755.4165135-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