Skip to content

Commit 6a137ca

Browse files
f0rm2l1nholtmann
authored andcommitted
Bluetooth: fix the erroneous flush_work() order
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 <[email protected]> Cc: Johan Hedberg <[email protected]> Cc: Luiz Augusto von Dentz <[email protected]> Cc: "David S. Miller" <[email protected]> Cc: Jakub Kicinski <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Signed-off-by: Lin Ma <[email protected]> Signed-off-by: Hao Xiong <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]>
1 parent 62f3415 commit 6a137ca

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

net/bluetooth/hci_core.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1610,8 +1610,13 @@ static int hci_dev_do_open(struct hci_dev *hdev)
16101610
} else {
16111611
/* Init failed, cleanup */
16121612
flush_work(&hdev->tx_work);
1613-
flush_work(&hdev->cmd_work);
1613+
1614+
/* Since hci_rx_work() is possible to awake new cmd_work
1615+
* it should be flushed first to avoid unexpected call of
1616+
* hci_cmd_work()
1617+
*/
16141618
flush_work(&hdev->rx_work);
1619+
flush_work(&hdev->cmd_work);
16151620

16161621
skb_queue_purge(&hdev->cmd_q);
16171622
skb_queue_purge(&hdev->rx_q);

0 commit comments

Comments
 (0)