Skip to content

Commit b5c5e96

Browse files
Wang Taogregkh
authored andcommitted
Bluetooth: MGMT: Fix list corruption and UAF in command complete handlers
[ Upstream commit 17f8934 ] Commit 302a1f6 ("Bluetooth: MGMT: Fix possible UAFs") introduced mgmt_pending_valid(), which not only validates the pending command but also unlinks it from the pending list if it is valid. This change in semantics requires updates to several completion handlers to avoid list corruption and memory safety issues. This patch addresses two left-over issues from the aforementioned rework: 1. In mgmt_add_adv_patterns_monitor_complete(), mgmt_pending_remove() is replaced with mgmt_pending_free() in the success path. Since mgmt_pending_valid() already unlinks the command at the beginning of the function, calling mgmt_pending_remove() leads to a double list_del() and subsequent list corruption/kernel panic. 2. In set_mesh_complete(), the use of mgmt_pending_foreach() in the error path is removed. Since the current command is already unlinked by mgmt_pending_valid(), this foreach loop would incorrectly target other pending mesh commands, potentially freeing them while they are still being processed concurrently (leading to UAFs). The redundant mgmt_cmd_status() is also simplified to use cmd->opcode directly. Fixes: 302a1f6 ("Bluetooth: MGMT: Fix possible UAFs") Signed-off-by: Wang Tao <wangtao554@huawei.com> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 84d041c commit b5c5e96

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

net/bluetooth/mgmt.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2183,10 +2183,7 @@ static void set_mesh_complete(struct hci_dev *hdev, void *data, int err)
21832183
sk = cmd->sk;
21842184

21852185
if (status) {
2186-
mgmt_cmd_status(cmd->sk, hdev->id, MGMT_OP_SET_MESH_RECEIVER,
2187-
status);
2188-
mgmt_pending_foreach(MGMT_OP_SET_MESH_RECEIVER, hdev, true,
2189-
cmd_status_rsp, &status);
2186+
mgmt_cmd_status(cmd->sk, hdev->id, cmd->opcode, status);
21902187
goto done;
21912188
}
21922189

@@ -5295,7 +5292,7 @@ static void mgmt_add_adv_patterns_monitor_complete(struct hci_dev *hdev,
52955292

52965293
mgmt_cmd_complete(cmd->sk, cmd->hdev->id, cmd->opcode,
52975294
mgmt_status(status), &rp, sizeof(rp));
5298-
mgmt_pending_remove(cmd);
5295+
mgmt_pending_free(cmd);
52995296

53005297
hci_dev_unlock(hdev);
53015298
bt_dev_dbg(hdev, "add monitor %d complete, status %d",

0 commit comments

Comments
 (0)