summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAmol Grover <frextrite@gmail.com>2020-02-16 22:56:54 +0530
committerPablo Neira Ayuso <pablo@netfilter.org>2020-04-06 14:31:25 +0200
commitb135fc0801b671c50de103572b819bcd41603613 (patch)
treefb1b588525deaeb5be469f198e5ea1ea6234c2ee /net
parent7fb6f78df7003234d8df4f90aeecc432d7d0c804 (diff)
downloadlinux-b135fc0801b671c50de103572b819bcd41603613.tar.bz2
netfilter: ipset: Pass lockdep expression to RCU lists
ip_set_type_list is traversed using list_for_each_entry_rcu outside an RCU read-side critical section but under the protection of ip_set_type_mutex. Hence, add corresponding lockdep expression to silence false-positive warnings, and harden RCU lists. Signed-off-by: Amol Grover <frextrite@gmail.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/ipset/ip_set_core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
index 8dd17589217d..340cb955af25 100644
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c
@@ -86,7 +86,8 @@ find_set_type(const char *name, u8 family, u8 revision)
{
struct ip_set_type *type;
- list_for_each_entry_rcu(type, &ip_set_type_list, list)
+ list_for_each_entry_rcu(type, &ip_set_type_list, list,
+ lockdep_is_held(&ip_set_type_mutex))
if (STRNCMP(type->name, name) &&
(type->family == family ||
type->family == NFPROTO_UNSPEC) &&