From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 8 Jun 2021 08:34:25 +0000 (+0200)
Subject: 5.10-stable patches
X-Git-Tag: v4.4.272~68
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=77749e8a88d2e68878179aefad73e942a5002a7b;p=thirdparty%2Fkernel%2Fstable-queue.git

5.10-stable patches

added patches:
	bluetooth-fix-the-erroneous-flush_work-order.patch
---

diff --git a/queue-5.10/bluetooth-fix-the-erroneous-flush_work-order.patch b/queue-5.10/bluetooth-fix-the-erroneous-flush_work-order.patch
new file mode 100644
index 00000000000..f1f31e4898f
--- /dev/null
+++ b/queue-5.10/bluetooth-fix-the-erroneous-flush_work-order.patch
@@ -0,0 +1,53 @@
+From 6a137caec23aeb9e036cdfd8a46dd8a366460e5d Mon Sep 17 00:00:00 2001
+From: Lin Ma <linma@zju.edu.cn>
+Date: Tue, 25 May 2021 14:39:02 +0200
+Subject: Bluetooth: fix the erroneous flush_work() order
+
+From: Lin Ma <linma@zju.edu.cn>
+
+commit 6a137caec23aeb9e036cdfd8a46dd8a366460e5d upstream.
+
+In the cleanup routine for failed initialization of HCI device,
+the flush_work(&hdev->rx_work) need to be finished before the
+flush_work(&hdev->cmd_work). Otherwise, the hci_rx_work() can
+possibly invoke new cmd_work and cause a bug, like double free,
+in late processings.
+
+This was assigned CVE-2021-3564.
+
+This patch reorder the flush_work() to fix this bug.
+
+Cc: Marcel Holtmann <marcel@holtmann.org>
+Cc: Johan Hedberg <johan.hedberg@gmail.com>
+Cc: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
+Cc: "David S. Miller" <davem@davemloft.net>
+Cc: Jakub Kicinski <kuba@kernel.org>
+Cc: linux-bluetooth@vger.kernel.org
+Cc: netdev@vger.kernel.org
+Cc: linux-kernel@vger.kernel.org
+Signed-off-by: Lin Ma <linma@zju.edu.cn>
+Signed-off-by: Hao Xiong <mart1n@zju.edu.cn>
+Cc: stable <stable@vger.kernel.org>
+Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ net/bluetooth/hci_core.c |    7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+--- a/net/bluetooth/hci_core.c
++++ b/net/bluetooth/hci_core.c
+@@ -1602,8 +1602,13 @@ setup_failed:
+ 	} else {
+ 		/* Init failed, cleanup */
+ 		flush_work(&hdev->tx_work);
+-		flush_work(&hdev->cmd_work);
++
++		/* Since hci_rx_work() is possible to awake new cmd_work
++		 * it should be flushed first to avoid unexpected call of
++		 * hci_cmd_work()
++		 */
+ 		flush_work(&hdev->rx_work);
++		flush_work(&hdev->cmd_work);
+ 
+ 		skb_queue_purge(&hdev->cmd_q);
+ 		skb_queue_purge(&hdev->rx_q);
diff --git a/queue-5.10/series b/queue-5.10/series
index 9c6452c5f54..56c4de25837 100644
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -75,3 +75,4 @@ io_uring-use-better-types-for-cflags.patch
 drm-amdgpu-vcn3-add-cancel_delayed_work_sync-before-.patch
 drm-amdgpu-jpeg2.5-add-cancel_delayed_work_sync-befo.patch
 drm-amdgpu-jpeg3-add-cancel_delayed_work_sync-before.patch
+bluetooth-fix-the-erroneous-flush_work-order.patch