Skip to content

Commit a66dfaf

Browse files
committed
Bluetooth: MGMT: Fix possible deadlocks
This fixes possible deadlocks like the following caused by hci_cmd_sync_dequeue causing the destroy function to run: INFO: task kworker/u19:0:143 blocked for more than 120 seconds. Tainted: G W O 6.8.0-2024-03-19-intel-next-iLS-24ww14 #1 "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. task:kworker/u19:0 state:D stack:0 pid:143 tgid:143 ppid:2 flags:0x00004000 Workqueue: hci0 hci_cmd_sync_work [bluetooth] Call Trace: <TASK> __schedule+0x374/0xaf0 schedule+0x3c/0xf0 schedule_preempt_disabled+0x1c/0x30 __mutex_lock.constprop.0+0x3ef/0x7a0 __mutex_lock_slowpath+0x13/0x20 mutex_lock+0x3c/0x50 mgmt_set_connectable_complete+0xa4/0x150 [bluetooth] ? kfree+0x211/0x2a0 hci_cmd_sync_dequeue+0xae/0x130 [bluetooth] ? __pfx_cmd_complete_rsp+0x10/0x10 [bluetooth] cmd_complete_rsp+0x26/0x80 [bluetooth] mgmt_pending_foreach+0x4d/0x70 [bluetooth] __mgmt_power_off+0x8d/0x180 [bluetooth] ? _raw_spin_unlock_irq+0x23/0x40 hci_dev_close_sync+0x445/0x5b0 [bluetooth] hci_set_powered_sync+0x149/0x250 [bluetooth] set_powered_sync+0x24/0x60 [bluetooth] hci_cmd_sync_work+0x90/0x150 [bluetooth] process_one_work+0x13e/0x300 worker_thread+0x2f7/0x420 ? __pfx_worker_thread+0x10/0x10 kthread+0x107/0x140 ? __pfx_kthread+0x10/0x10 ret_from_fork+0x3d/0x60 ? __pfx_kthread+0x10/0x10 ret_from_fork_asm+0x1b/0x30 </TASK> Tested-by: Kiran K <kiran.k@intel.com> Fixes: f53e1c9 ("Bluetooth: MGMT: Fix possible crash on mgmt_index_removed") Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
1 parent 0b88294 commit a66dfaf

File tree

1 file changed

+18
-9
lines changed

1 file changed

+18
-9
lines changed

net/bluetooth/mgmt.c

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1518,7 +1518,8 @@ static void mgmt_set_discoverable_complete(struct hci_dev *hdev, void *data,
15181518
bt_dev_dbg(hdev, "err %d", err);
15191519

15201520
/* Make sure cmd still outstanding. */
1521-
if (cmd != pending_find(MGMT_OP_SET_DISCOVERABLE, hdev))
1521+
if (err == -ECANCELED ||
1522+
cmd != pending_find(MGMT_OP_SET_DISCOVERABLE, hdev))
15221523
return;
15231524

15241525
hci_dev_lock(hdev);
@@ -1692,7 +1693,8 @@ static void mgmt_set_connectable_complete(struct hci_dev *hdev, void *data,
16921693
bt_dev_dbg(hdev, "err %d", err);
16931694

16941695
/* Make sure cmd still outstanding. */
1695-
if (cmd != pending_find(MGMT_OP_SET_CONNECTABLE, hdev))
1696+
if (err == -ECANCELED ||
1697+
cmd != pending_find(MGMT_OP_SET_CONNECTABLE, hdev))
16961698
return;
16971699

16981700
hci_dev_lock(hdev);
@@ -1924,7 +1926,7 @@ static void set_ssp_complete(struct hci_dev *hdev, void *data, int err)
19241926
bool changed;
19251927

19261928
/* Make sure cmd still outstanding. */
1927-
if (cmd != pending_find(MGMT_OP_SET_SSP, hdev))
1929+
if (err == -ECANCELED || cmd != pending_find(MGMT_OP_SET_SSP, hdev))
19281930
return;
19291931

19301932
if (err) {
@@ -3848,7 +3850,8 @@ static void set_name_complete(struct hci_dev *hdev, void *data, int err)
38483850

38493851
bt_dev_dbg(hdev, "err %d", err);
38503852

3851-
if (cmd != pending_find(MGMT_OP_SET_LOCAL_NAME, hdev))
3853+
if (err == -ECANCELED ||
3854+
cmd != pending_find(MGMT_OP_SET_LOCAL_NAME, hdev))
38523855
return;
38533856

38543857
if (status) {
@@ -4023,7 +4026,8 @@ static void set_default_phy_complete(struct hci_dev *hdev, void *data, int err)
40234026
struct sk_buff *skb = cmd->skb;
40244027
u8 status = mgmt_status(err);
40254028

4026-
if (cmd != pending_find(MGMT_OP_SET_PHY_CONFIGURATION, hdev))
4029+
if (err == -ECANCELED ||
4030+
cmd != pending_find(MGMT_OP_SET_PHY_CONFIGURATION, hdev))
40274031
return;
40284032

40294033
if (!status) {
@@ -5914,13 +5918,16 @@ static void start_discovery_complete(struct hci_dev *hdev, void *data, int err)
59145918
{
59155919
struct mgmt_pending_cmd *cmd = data;
59165920

5921+
bt_dev_dbg(hdev, "err %d", err);
5922+
5923+
if (err == -ECANCELED)
5924+
return;
5925+
59175926
if (cmd != pending_find(MGMT_OP_START_DISCOVERY, hdev) &&
59185927
cmd != pending_find(MGMT_OP_START_LIMITED_DISCOVERY, hdev) &&
59195928
cmd != pending_find(MGMT_OP_START_SERVICE_DISCOVERY, hdev))
59205929
return;
59215930

5922-
bt_dev_dbg(hdev, "err %d", err);
5923-
59245931
mgmt_cmd_complete(cmd->sk, cmd->index, cmd->opcode, mgmt_status(err),
59255932
cmd->param, 1);
59265933
mgmt_pending_remove(cmd);
@@ -6153,7 +6160,8 @@ static void stop_discovery_complete(struct hci_dev *hdev, void *data, int err)
61536160
{
61546161
struct mgmt_pending_cmd *cmd = data;
61556162

6156-
if (cmd != pending_find(MGMT_OP_STOP_DISCOVERY, hdev))
6163+
if (err == -ECANCELED ||
6164+
cmd != pending_find(MGMT_OP_STOP_DISCOVERY, hdev))
61576165
return;
61586166

61596167
bt_dev_dbg(hdev, "err %d", err);
@@ -8144,7 +8152,8 @@ static void read_local_oob_ext_data_complete(struct hci_dev *hdev, void *data,
81448152
u8 status = mgmt_status(err);
81458153
u16 eir_len;
81468154

8147-
if (cmd != pending_find(MGMT_OP_READ_LOCAL_OOB_EXT_DATA, hdev))
8155+
if (err == -ECANCELED ||
8156+
cmd != pending_find(MGMT_OP_READ_LOCAL_OOB_EXT_DATA, hdev))
81488157
return;
81498158

81508159
if (!status) {

0 commit comments

Comments
 (0)