]> git.baikalelectronics.ru Git - kernel.git/commit
net: bridge: mcast: fix vlan port router deadlock
authorNikolay Aleksandrov <nikolay@nvidia.com>
Fri, 3 Sep 2021 09:34:15 +0000 (12:34 +0300)
committerDavid S. Miller <davem@davemloft.net>
Fri, 3 Sep 2021 12:43:19 +0000 (13:43 +0100)
commit3afb45ae574e70bb82e648c33d06e7779d60ebb7
tree8563288bda78a32c668b9a5980fa9fcd2607c7c4
parent592193456e87cc1368d46e5e6bc0d999511c6116
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: 11bc7082e84c ("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>
net/bridge/br_multicast.c