diff options
| author | Eric Dumazet <edumazet@google.com> | 2025-06-30 15:19:28 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-08-15 13:08:46 +0300 |
| commit | e0b8b6687b7d5c4428d9042b5963034e4bf9b995 (patch) | |
| tree | 0dd39b5afa2d666312a1439ac6231395c186a7d7 /include | |
| parent | 62d7cf455c887941ed6f105cd430ba04ee0b6c9f (diff) | |
| download | linux-e0b8b6687b7d5c4428d9042b5963034e4bf9b995.tar.xz | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/dst.h | 2 | ||||
| -rw-r--r-- | include/net/lwtunnel.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/net/dst.h b/include/net/dst.h index 16b7b99b5f30..ef7f88f01881 100644 --- a/include/net/dst.h +++ b/include/net/dst.h @@ -474,7 +474,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 53bd2d02a4f0..a4632a64daae 100644 --- 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 |