]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ipv4: add RCU protection to ip4_dst_hoplimit()
authorEric Dumazet <edumazet@google.com>
Wed, 5 Feb 2025 15:51:10 +0000 (15:51 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 21 Feb 2025 12:50:06 +0000 (13:50 +0100)
[ Upstream commit 469308552ca4560176cfc100e7ca84add1bebd7c ]

ip4_dst_hoplimit() must use RCU protection to make
sure the net structure it reads does not disappear.

Fixes: fa50d974d104 ("ipv4: Namespaceify ip_default_ttl sysctl knob")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://patch.msgid.link/20250205155120.1676781-3-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
include/net/route.h

index af8431b25f80059ef56204ca2ca0e5e26ae226b4..f396176022377722ccd06a17b3d8a7eabdae7f0d 100644 (file)
@@ -362,10 +362,15 @@ static inline int inet_iif(const struct sk_buff *skb)
 static inline int ip4_dst_hoplimit(const struct dst_entry *dst)
 {
        int hoplimit = dst_metric_raw(dst, RTAX_HOPLIMIT);
-       struct net *net = dev_net(dst->dev);
 
-       if (hoplimit == 0)
+       if (hoplimit == 0) {
+               const struct net *net;
+
+               rcu_read_lock();
+               net = dev_net_rcu(dst->dev);
                hoplimit = READ_ONCE(net->ipv4.sysctl_ip_default_ttl);
+               rcu_read_unlock();
+       }
        return hoplimit;
 }