Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B94E33B27ED; Mon, 23 Mar 2026 15:14:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774278847; cv=none; b=UqIlk6WHOiwSdlLbSGeqOtqp88JidN0AmUGbBWkxOLk4lygNSeANnVwngIEr31VGdF2IbuIR48PorZAQLQfduVIOfRU4VkGf0hks7aKKWoI/qUp+eyXZ1j5ULCG0Dr44MTkpB31HqVSyIbYGx270rsBstjZrpdCCZZOIBzhVuLM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774278847; c=relaxed/simple; bh=AlNe2Gp7Mer0rj+LOhNmdFtOVobO5KINzl1ssVrUl6s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lQJ4vCKKqY4DgHTFkJdhBpwkADBoD08/akkxX8DLXh1wvcErkoijQ+DTgQsKcaxfUodp8LikwQXqpz6WSM/TZ+nWDZIbHRpwQgz8g3+QH32p+Nk8QBylsVfBoKcFXn7/C+z4dDbXjoGr/e+QS9S6NlAnZr4DElYfQnR/ICWZnEo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=npx5aB5t; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="npx5aB5t" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F191EC2BCB3; Mon, 23 Mar 2026 15:14:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774278847; bh=AlNe2Gp7Mer0rj+LOhNmdFtOVobO5KINzl1ssVrUl6s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=npx5aB5tcxVc4M21IZab4Dbi2QVMdJbc5sxp/tuDfA+e0F3EZWlmP6myLVAqIk/ri Zz3J4iN7/TZgENcyzQGE3VSPzsywm5D6glrG6wAXEnAicSVgptx1G9m9C6prHt/U4I hDgtB60jBOw8gTzhLVYp5tXPiDyV/+eim+zhQkvA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "edumazet@google.com, kuniyu@google.com, kuba@kernel.org, dsahern@kernel.org, netdev@vger.kernel.org, Ruohan Lan" , Eric Dumazet , David Ahern , Jakub Kicinski , Ruohan Lan Subject: [PATCH 6.6 438/567] net: use dst_dev_rcu() in sk_setup_caps() Date: Mon, 23 Mar 2026 14:45:58 +0100 Message-ID: <20260323134544.788448840@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260323134533.749096647@linuxfoundation.org> References: <20260323134533.749096647@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Dumazet [ Upstream commit 99a2ace61b211b0be861b07fbaa062fca4b58879 ] Use RCU to protect accesses to dst->dev from sk_setup_caps() and sk_dst_gso_max_size(). Also use dst_dev_rcu() in ip6_dst_mtu_maybe_forward(), and ip_dst_mtu_maybe_forward(). ip4_dst_hoplimit() can use dst_dev_net_rcu(). 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-6-edumazet@google.com Signed-off-by: Jakub Kicinski [ Adjust context ] Signed-off-by: Ruohan Lan Signed-off-by: Greg Kroah-Hartman --- include/net/ip.h | 7 +++++-- include/net/ip6_route.h | 2 +- include/net/route.h | 2 +- net/core/sock.c | 16 ++++++++++------ 4 files changed, 17 insertions(+), 10 deletions(-) --- a/include/net/ip.h +++ b/include/net/ip.h @@ -458,9 +458,12 @@ static inline unsigned int ip_dst_mtu_ma bool forwarding) { const struct rtable *rt = container_of(dst, struct rtable, dst); - struct net *net = dev_net(dst->dev); + struct net *net; + const struct net_device *dev; unsigned int mtu; + dev = dst_dev_rcu(dst); + net = dev_net_rcu(dev); if (READ_ONCE(net->ipv4.sysctl_ip_fwd_use_pmtu) || ip_mtu_locked(dst) || !forwarding) { @@ -474,7 +477,7 @@ static inline unsigned int ip_dst_mtu_ma if (mtu) goto out; - mtu = READ_ONCE(dst->dev->mtu); + mtu = READ_ONCE(dev->mtu); if (unlikely(ip_mtu_locked(dst))) { if (rt->rt_uses_gateway && mtu > 576) --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h @@ -333,7 +333,7 @@ static inline unsigned int ip6_dst_mtu_m mtu = IPV6_MIN_MTU; rcu_read_lock(); - idev = __in6_dev_get(dst->dev); + idev = __in6_dev_get(dst_dev_rcu(dst)); if (idev) mtu = idev->cnf.mtu6; rcu_read_unlock(); --- a/include/net/route.h +++ b/include/net/route.h @@ -363,7 +363,7 @@ static inline int ip4_dst_hoplimit(const const struct net *net; rcu_read_lock(); - net = dev_net_rcu(dst->dev); + net = dst_dev_net_rcu(dst); hoplimit = READ_ONCE(net->ipv4.sysctl_ip_default_ttl); rcu_read_unlock(); } --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2440,7 +2440,7 @@ void sk_free_unlock_clone(struct sock *s } EXPORT_SYMBOL_GPL(sk_free_unlock_clone); -static u32 sk_dst_gso_max_size(struct sock *sk, struct dst_entry *dst) +static u32 sk_dst_gso_max_size(struct sock *sk, const struct net_device *dev) { bool is_ipv6 = false; u32 max_size; @@ -2450,8 +2450,8 @@ static u32 sk_dst_gso_max_size(struct so !ipv6_addr_v4mapped(&sk->sk_v6_rcv_saddr)); #endif /* pairs with the WRITE_ONCE() in netif_set_gso(_ipv4)_max_size() */ - max_size = is_ipv6 ? READ_ONCE(dst_dev(dst)->gso_max_size) : - READ_ONCE(dst_dev(dst)->gso_ipv4_max_size); + max_size = is_ipv6 ? READ_ONCE(dev->gso_max_size) : + READ_ONCE(dev->gso_ipv4_max_size); if (max_size > GSO_LEGACY_MAX_SIZE && !sk_is_tcp(sk)) max_size = GSO_LEGACY_MAX_SIZE; @@ -2460,9 +2460,12 @@ static u32 sk_dst_gso_max_size(struct so void sk_setup_caps(struct sock *sk, struct dst_entry *dst) { + const struct net_device *dev; u32 max_segs = 1; - sk->sk_route_caps = dst_dev(dst)->features; + rcu_read_lock(); + dev = dst_dev_rcu(dst); + sk->sk_route_caps = dev->features; if (sk_is_tcp(sk)) sk->sk_route_caps |= NETIF_F_GSO; if (sk->sk_route_caps & NETIF_F_GSO) @@ -2474,13 +2477,14 @@ void sk_setup_caps(struct sock *sk, stru sk->sk_route_caps &= ~NETIF_F_GSO_MASK; } else { sk->sk_route_caps |= NETIF_F_SG | NETIF_F_HW_CSUM; - sk->sk_gso_max_size = sk_dst_gso_max_size(sk, dst); + sk->sk_gso_max_size = sk_dst_gso_max_size(sk, dev); /* pairs with the WRITE_ONCE() in netif_set_gso_max_segs() */ - max_segs = max_t(u32, READ_ONCE(dst_dev(dst)->gso_max_segs), 1); + max_segs = max_t(u32, READ_ONCE(dev->gso_max_segs), 1); } } sk->sk_gso_max_segs = max_segs; sk_dst_set(sk, dst); + rcu_read_unlock(); } EXPORT_SYMBOL_GPL(sk_setup_caps);