summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2024-06-04 11:16:03 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-12-14 19:53:33 +0100
commitad3c88eb3cc53f881cbbf41d584a9451c5d0e7e4 (patch)
tree28126d8e98e578e32a5115412d0464aa134c92dc /include/net
parentadf86509384a70a4780bc94eee43f15e8d36ce01 (diff)
downloadlinux-ad3c88eb3cc53f881cbbf41d584a9451c5d0e7e4.tar.gz
linux-ad3c88eb3cc53f881cbbf41d584a9451c5d0e7e4.tar.bz2
linux-ad3c88eb3cc53f881cbbf41d584a9451c5d0e7e4.zip
net: use unrcu_pointer() helper
[ Upstream commit b4cb4a1391dcdc640c4ade003aaf0ee19cc8d509 ] Toke mentioned unrcu_pointer() existence, allowing to remove some of the ugly casts we have when using xchg() for rcu protected pointers. Also make inet_rcv_compat const. Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Toke Høiland-Jørgensen <toke@redhat.com> Reviewed-by: Toke Høiland-Jørgensen <toke@redhat.com> Link: https://lore.kernel.org/r/20240604111603.45871-1-edumazet@google.com Signed-off-by: Paolo Abeni <pabeni@redhat.com> Stable-dep-of: eb02688c5c45 ("ipv6: release nexthop on device removal") Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/sock.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h
index 1b39b62d44e2..0a06c997b45b 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -2246,7 +2246,7 @@ sk_dst_set(struct sock *sk, struct dst_entry *dst)
sk_tx_queue_clear(sk);
WRITE_ONCE(sk->sk_dst_pending_confirm, 0);
- old_dst = xchg((__force struct dst_entry **)&sk->sk_dst_cache, dst);
+ old_dst = unrcu_pointer(xchg(&sk->sk_dst_cache, RCU_INITIALIZER(dst)));
dst_release(old_dst);
}