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

Fixes for 4.19

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

diff --git a/queue-4.19/bluetooth-hci_sync-cancel-cmd_timer-if-hci_open-fail.patch b/queue-4.19/bluetooth-hci_sync-cancel-cmd_timer-if-hci_open-fail.patch
new file mode 100644
index 00000000000..1ff72d12727
--- /dev/null
+++ b/queue-4.19/bluetooth-hci_sync-cancel-cmd_timer-if-hci_open-fail.patch
@@ -0,0 +1,36 @@
+From 8b05312328060014350068dfe42f7190b3480f02 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 e87777255c47..497c8ac140d1 100644
+--- a/net/bluetooth/hci_core.c
++++ b/net/bluetooth/hci_core.c
+@@ -1519,6 +1519,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.19/series b/queue-4.19/series
index e1c8b664cba..328b37f9660 100644
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -37,3 +37,4 @@ mmc-sdhci-esdhc-imx-correct-the-tuning-start-tap-and.patch
 netfilter-conntrack-do-not-renew-entry-stuck-in-tcp-.patch
 block-fix-and-cleanup-bio_check_ro.patch
 perf-env-do-not-return-pointers-to-local-variables.patch
+bluetooth-hci_sync-cancel-cmd_timer-if-hci_open-fail.patch