diff options
| author | Vladimir Oltean <vladimir.oltean@nxp.com> | 2022-03-02 21:39:39 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-03-08 19:00:59 +0100 |
| commit | 19f132730d147d587dbe1133571e58d1f8c38f09 (patch) | |
| tree | a7e59524e8e403f45b373a85a273137faa8f7b2d | |
| parent | 1bf82f3a0eb1eb39e17056b376adb429ae68dbaa (diff) | |
| download | linux-stable-19f132730d147d587dbe1133571e58d1f8c38f09.tar.gz linux-stable-19f132730d147d587dbe1133571e58d1f8c38f09.tar.bz2 linux-stable-19f132730d147d587dbe1133571e58d1f8c38f09.zip | |
net: dcb: disable softirqs in dcbnl_flush_dev()
commit 10b6bb62ae1a49ee818fc479cf57b8900176773e upstream.
Ido Schimmel points out that since commit 52cff74eef5d ("dcbnl : Disable
software interrupts before taking dcb_lock"), the DCB API can be called
by drivers from softirq context.
One such in-tree example is the chelsio cxgb4 driver:
dcb_rpl
-> cxgb4_dcb_handle_fw_update
-> dcb_ieee_setapp
If the firmware for this driver happened to send an event which resulted
in a call to dcb_ieee_setapp() at the exact same time as another
DCB-enabled interface was unregistering on the same CPU, the softirq
would deadlock, because the interrupted process was already holding the
dcb_lock in dcbnl_flush_dev().
Fix this unlikely event by using spin_lock_bh() in dcbnl_flush_dev() as
in the rest of the dcbnl code.
Fixes: 91b0383fef06 ("net: dcb: flush lingering app table entries for unregistered devices")
Reported-by: Ido Schimmel <idosch@idosch.org>
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Link: https://lore.kernel.org/r/20220302193939.1368823-1-vladimir.oltean@nxp.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/dcb/dcbnl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dcb/dcbnl.c b/net/dcb/dcbnl.c index bbbd1b54ef60..e32a520c3702 100644 --- a/net/dcb/dcbnl.c +++ b/net/dcb/dcbnl.c @@ -1942,7 +1942,7 @@ static void dcbnl_flush_dev(struct net_device *dev) { struct dcb_app_type *itr, *tmp; - spin_lock(&dcb_lock); + spin_lock_bh(&dcb_lock); list_for_each_entry_safe(itr, tmp, &dcb_app_list, list) { if (itr->ifindex == dev->ifindex) { @@ -1951,7 +1951,7 @@ static void dcbnl_flush_dev(struct net_device *dev) } } - spin_unlock(&dcb_lock); + spin_unlock_bh(&dcb_lock); } static int dcbnl_netdevice_event(struct notifier_block *nb, |