UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: bridge: mcast: fix vlan port router deadlock 

Before vlan/port mcast router support was added
br_multicast_set_port_router was used only with bh already disabled due
to the bridge port lock, but that is no longer the case and when it is
called to configure a vlan/port mcast router we can deadlock with the
timer, so always disable bh to make sure it can be called from contexts
with both enabled and disabled bh.

Fixes: 2796d846d7 ("net: bridge: vlan: convert mcast router global option to per-vlan entry")
Signed-off-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nikolay Aleksandrov 2021-09-03 12:34:15 +03:00 committed by David S. Miller
parent f1181e39d6
commit ddd0d52938
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/bridge/br_multicast.c
View File

@ -4255,7 +4255,7 @@ int br_multicast_set_port_router(struct net_bridge_mcast_port *pmctx,
bool del = false; bool del = false;
brmctx = br_multicast_port_ctx_get_global(pmctx); brmctx = br_multicast_port_ctx_get_global(pmctx);
spin_lock(&brmctx->br->multicast_lock); spin_lock_bh(&brmctx->br->multicast_lock);
if (pmctx->multicast_router == val) { if (pmctx->multicast_router == val) {
/* Refresh the temp router port timer */ /* Refresh the temp router port timer */
if (pmctx->multicast_router == MDB_RTR_TYPE_TEMP) { if (pmctx->multicast_router == MDB_RTR_TYPE_TEMP) {
@ -4305,7 +4305,7 @@ int br_multicast_set_port_router(struct net_bridge_mcast_port *pmctx,
} }
err = 0; err = 0;
unlock: unlock:
spin_unlock(&brmctx->br->multicast_lock); spin_unlock_bh(&brmctx->br->multicast_lock);
return err; return err;
} }