From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 7 Mar 2022 08:00:47 +0000 (+0100)
Subject: 4.14-stable patches
X-Git-Tag: v4.9.305~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e35a936f860352c070455d350e6f36ef6fd530db;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

added patches:
	net-dcb-disable-softirqs-in-dcbnl_flush_dev.patch
---

diff --git a/queue-4.14/net-dcb-disable-softirqs-in-dcbnl_flush_dev.patch b/queue-4.14/net-dcb-disable-softirqs-in-dcbnl_flush_dev.patch
new file mode 100644
index 00000000000..e17dacf82dc
--- /dev/null
+++ b/queue-4.14/net-dcb-disable-softirqs-in-dcbnl_flush_dev.patch
@@ -0,0 +1,57 @@
+From 10b6bb62ae1a49ee818fc479cf57b8900176773e Mon Sep 17 00:00:00 2001
+From: Vladimir Oltean <vladimir.oltean@nxp.com>
+Date: Wed, 2 Mar 2022 21:39:39 +0200
+Subject: net: dcb: disable softirqs in dcbnl_flush_dev()
+
+From: Vladimir Oltean <vladimir.oltean@nxp.com>
+
+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>
+---
+ net/dcb/dcbnl.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/net/dcb/dcbnl.c
++++ b/net/dcb/dcbnl.c
+@@ -1943,7 +1943,7 @@ static void dcbnl_flush_dev(struct net_d
+ {
+ 	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) {
+@@ -1952,7 +1952,7 @@ static void dcbnl_flush_dev(struct net_d
+ 		}
+ 	}
+ 
+-	spin_unlock(&dcb_lock);
++	spin_unlock_bh(&dcb_lock);
+ }
+ 
+ static int dcbnl_netdevice_event(struct notifier_block *nb,
diff --git a/queue-4.14/series b/queue-4.14/series
index f224b5114bb..707768b9ad5 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -39,3 +39,4 @@ input-elan_i2c-move-regulator_able-out-of-elan_able_power.patch
 input-elan_i2c-fix-regulator-enable-count-imbalance-after-suspend-resume.patch
 hid-add-mapping-for-key_all_applications.patch
 memfd-fix-f_seal_write-after-shmem-huge-page-allocated.patch
+net-dcb-disable-softirqs-in-dcbnl_flush_dev.patch