From: Sasha Levin <sashal@kernel.org>
Date: Fri, 27 Jan 2023 02:07:33 +0000 (-0500)
Subject: Fixes for 4.14
X-Git-Tag: v5.10.166~70^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a51f52ff9572a8c5f2d719828d13e85ae480934e;p=thirdparty%2Fkernel%2Fstable-queue.git

Fixes for 4.14

Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/queue-4.14/bluetooth-hci_sync-cancel-cmd_timer-if-hci_open-fail.patch b/queue-4.14/bluetooth-hci_sync-cancel-cmd_timer-if-hci_open-fail.patch
new file mode 100644
index 00000000000..cc3fd1590df
--- /dev/null
+++ b/queue-4.14/bluetooth-hci_sync-cancel-cmd_timer-if-hci_open-fail.patch
@@ -0,0 +1,36 @@
+From bf2185e3556f2fed4b27af66813f0b752d2d992a Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Thu, 26 Jan 2023 16:38:17 +0300
+Subject: Bluetooth: hci_sync: cancel cmd_timer if hci_open failed
+
+From: Archie Pusaka <apusaka@chromium.org>
+
+commit 97dfaf073f5881c624856ef293be307b6166115c upstream.
+
+If a command is already sent, we take care of freeing it, but we
+also need to cancel the timeout as well.
+
+Signed-off-by: Archie Pusaka <apusaka@chromium.org>
+Reviewed-by: Abhishek Pandit-Subedi <abhishekpandit@google.com>
+Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
+Signed-off-by: Fedor Pchelkin <pchelkin@ispras.ru>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ net/bluetooth/hci_core.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
+index 81a151ca4a24..1fd6498e3387 100644
+--- a/net/bluetooth/hci_core.c
++++ b/net/bluetooth/hci_core.c
+@@ -1479,6 +1479,7 @@ static int hci_dev_do_open(struct hci_dev *hdev)
+ 			hdev->flush(hdev);
+ 
+ 		if (hdev->sent_cmd) {
++			cancel_delayed_work_sync(&hdev->cmd_timer);
+ 			kfree_skb(hdev->sent_cmd);
+ 			hdev->sent_cmd = NULL;
+ 		}
+-- 
+2.39.0
+
diff --git a/queue-4.14/series b/queue-4.14/series
index 20b016244f0..8bae9f7fae2 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -20,3 +20,4 @@ hid-betop-check-shape-of-output-reports.patch
 w1-fix-deadloop-in-__w1_remove_master_device.patch
 w1-fix-warning-after-calling-w1_process.patch
 comedi-adv_pci1760-fix-pwm-instruction-handling.patch
+bluetooth-hci_sync-cancel-cmd_timer-if-hci_open-fail.patch