net: dst: annotate data-races around dst->input

[ Upstream commit f1c5fd34891a1c242885f48c2e4dc52df180f311 ]

dst_dev_put() can overwrite dst->input while other
cpus might read this field (for instance from dst_input())

Add READ_ONCE()/WRITE_ONCE() annotations to suppress
potential issues.

We will likely need full RCU protection later.

Fixes: 4a6ce2b6f2ec ("net: introduce a new function dst_dev_put()")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Kuniyuki Iwashima <kuniyu@google.com>
Link: https://patch.msgid.link/20250630121934.3399505-5-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/include/net/dst.h b/include/net/dst.h
index 78c78cdce0e9a7d2f8eb3f3c878d0e0bfe10bfc2..65d81116d6bf551e4fbc23c703515847c2e3372e 100644 (file)
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -466,7 +466,7 @@ INDIRECT_CALLABLE_DECLARE(int ip_local_deliver(struct sk_buff *));
 /* Input packet from network to transport.  */
 static inline int dst_input(struct sk_buff *skb)
 {
-       return INDIRECT_CALL_INET(skb_dst(skb)->input,
+       return INDIRECT_CALL_INET(READ_ONCE(skb_dst(skb)->input),
                                  ip6_input, ip_local_deliver, skb);
 }
 

diff --git a/include/net/lwtunnel.h b/include/net/lwtunnel.h
index c306ebe379a0b37ecc5ce54c864824c91aaea273..eaac07d505959e263e479e0fe288424371945f5d 100644 (file)
--- a/include/net/lwtunnel.h
+++ b/include/net/lwtunnel.h
@@ -142,8 +142,8 @@ static inline void lwtunnel_set_redirect(struct dst_entry *dst)
                dst->output = lwtunnel_output;
        }
        if (lwtunnel_input_redirect(dst->lwtstate)) {
-               dst->lwtstate->orig_input = dst->input;
-               dst->input = lwtunnel_input;
+               dst->lwtstate->orig_input = READ_ONCE(dst->input);
+               WRITE_ONCE(dst->input, lwtunnel_input);
        }
 }
 #else

diff --git a/net/core/dst.c b/net/core/dst.c
index 795ca07e28a4ef0a4811e18d8340cfc6fda64c0b..b46f7722a1b6682be974839265a176eb3fc29b3d 100644 (file)
--- a/net/core/dst.c
+++ b/net/core/dst.c
@@ -148,7 +148,7 @@ void dst_dev_put(struct dst_entry *dst)
        dst->obsolete = DST_OBSOLETE_DEAD;
        if (dst->ops->ifdown)
                dst->ops->ifdown(dst, dev);
-       dst->input = dst_discard;
+       WRITE_ONCE(dst->input, dst_discard);
        dst->output = dst_discard_out;
        dst->dev = blackhole_netdev;
        netdev_ref_replace(dev, blackhole_netdev, &dst->dev_tracker,

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 64ac20c27f1bd393ba220d28c7421f19c6eebe89..2cc88f8c3bc6aa74d7f41976a6a61f8615319466 100644 (file)
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1685,7 +1685,7 @@ struct rtable *rt_dst_clone(struct net_device *dev, struct rtable *rt)
                else if (rt->rt_gw_family == AF_INET6)
                        new_rt->rt_gw6 = rt->rt_gw6;
 
-               new_rt->dst.input = rt->dst.input;
+               new_rt->dst.input = READ_ONCE(rt->dst.input);
                new_rt->dst.output = rt->dst.output;
                new_rt->dst.error = rt->dst.error;
                new_rt->dst.lastuse = jiffies;