mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 04:18:39 +08:00
inet: ping: use hlist_nulls rcu iterator during lookup
ping_lookup() does not acquire the table spinlock, so iteration should
use hlist_nulls_for_each_entry_rcu().
Spotted during code review.
Fixes: dbca1596bb
("ping: convert to RCU lookups, get rid of rwlock")
Cc: Eric Dumazet <edumazet@google.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Link: https://lore.kernel.org/r/20221129140644.28525-1-fw@strlen.de
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
parent
9aff0ec5cb
commit
c25b7a7a56
@ -535,6 +535,7 @@ ForEachMacros:
|
||||
- 'perf_hpp_list__for_each_sort_list_safe'
|
||||
- 'perf_pmu__for_each_hybrid_pmu'
|
||||
- 'ping_portaddr_for_each_entry'
|
||||
- 'ping_portaddr_for_each_entry_rcu'
|
||||
- 'plist_for_each'
|
||||
- 'plist_for_each_continue'
|
||||
- 'plist_for_each_entry'
|
||||
|
@ -16,9 +16,6 @@
|
||||
#define PING_HTABLE_SIZE 64
|
||||
#define PING_HTABLE_MASK (PING_HTABLE_SIZE-1)
|
||||
|
||||
#define ping_portaddr_for_each_entry(__sk, node, list) \
|
||||
hlist_nulls_for_each_entry(__sk, node, list, sk_nulls_node)
|
||||
|
||||
/*
|
||||
* gid_t is either uint or ushort. We want to pass it to
|
||||
* proc_dointvec_minmax(), so it must not be larger than MAX_INT
|
||||
|
@ -49,6 +49,11 @@
|
||||
#include <net/transp_v6.h>
|
||||
#endif
|
||||
|
||||
#define ping_portaddr_for_each_entry(__sk, node, list) \
|
||||
hlist_nulls_for_each_entry(__sk, node, list, sk_nulls_node)
|
||||
#define ping_portaddr_for_each_entry_rcu(__sk, node, list) \
|
||||
hlist_nulls_for_each_entry_rcu(__sk, node, list, sk_nulls_node)
|
||||
|
||||
struct ping_table {
|
||||
struct hlist_nulls_head hash[PING_HTABLE_SIZE];
|
||||
spinlock_t lock;
|
||||
@ -192,7 +197,7 @@ static struct sock *ping_lookup(struct net *net, struct sk_buff *skb, u16 ident)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
ping_portaddr_for_each_entry(sk, hnode, hslot) {
|
||||
ping_portaddr_for_each_entry_rcu(sk, hnode, hslot) {
|
||||
isk = inet_sk(sk);
|
||||
|
||||
pr_debug("iterate\n");
|
||||
|
Loading…
Reference in New Issue
Block a user