From 41a84ba01c2b9e506a6673e7b8d356870fd0dcfb Mon Sep 17 00:00:00 2001 From: Ksawlii Date: Sun, 24 Nov 2024 00:22:55 +0100 Subject: [PATCH] Revert "net: Fix an unsafe loop on the list" This reverts commit eddd768153e0e897584d5c921b73c181cfe1e45c. --- include/net/sock.h | 2 -- net/netlink/af_netlink.c | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/include/net/sock.h b/include/net/sock.h index 2da4613f6..6690b925c 100755 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -882,8 +882,6 @@ static inline void sk_add_bind_node(struct sock *sk, hlist_for_each_entry_safe(__sk, tmp, list, sk_node) #define sk_for_each_bound(__sk, list) \ hlist_for_each_entry(__sk, list, sk_bind_node) -#define sk_for_each_bound_safe(__sk, tmp, list) \ - hlist_for_each_entry_safe(__sk, tmp, list, sk_bind_node) /** * sk_for_each_entry_offset_rcu - iterate over a list at a given struct offset diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index bda604b37..4f2a3d465 100755 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -2155,9 +2155,8 @@ void __netlink_clear_multicast_users(struct sock *ksk, unsigned int group) { struct sock *sk; struct netlink_table *tbl = &nl_table[ksk->sk_protocol]; - struct hlist_node *tmp; - sk_for_each_bound_safe(sk, tmp, &tbl->mc_list) + sk_for_each_bound(sk, &tbl->mc_list) netlink_update_socket_mc(nlk_sk(sk), group, 0); }