diff options
| author | Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | 2019-04-11 15:08:25 +0300 |
|---|---|---|
| committer | Elektroschmock <elektroschmock78@googlemail.com> | 2019-08-20 19:22:08 +0200 |
| commit | 65f6a798a5500ce4ade68cf66db670269cdcb9b5 (patch) | |
| tree | 7d413d392205eca078aac230919ac6167ffa735c | |
| parent | 5c960ce84a8c24cfffcc300101e31b011ca3d7be (diff) | |
commit c5b493ce192bd7a4e7bd073b5685aad121eeef82 upstream.
br_multicast_start_querier() walks over the port list but it can be
called from a timer with only multicast_lock held which doesn't protect
the port list, so use RCU to walk over it.
Fixes: c83b8fab06fc ("bridge: Restart queries when last querier expires")
Change-Id: Ic030f401e560c16f919e03cb987201869e3926b7
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | net/bridge/br_multicast.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index a09ea178348..15f2525099c 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -1772,13 +1772,15 @@ static void br_multicast_start_querier(struct net_bridge *br) br_multicast_open(br); - list_for_each_entry(port, &br->port_list, list) { + rcu_read_lock(); + list_for_each_entry_rcu(port, &br->port_list, list) { if (port->state == BR_STATE_DISABLED || port->state == BR_STATE_BLOCKING) continue; __br_multicast_enable_port(port); } + rcu_read_unlock(); } int br_multicast_toggle(struct net_bridge *br, unsigned long val) |