Skip to content

[PW_SID:1078865] Bluetooth: hci_event: fix potential UAF in SSP passkey handlers #3465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BluezTestBot wants to merge 1 commit into
base: workflow
Choose a base branch
from
Open

[PW_SID:1078865] Bluetooth: hci_event: fix potential UAF in SSP passkey handlers #3465

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions net/bluetooth/hci_event.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5495,9 +5495,11 @@ static void hci_user_passkey_notify_evt(struct hci_dev *hdev, void *data,

bt_dev_dbg(hdev, "");

hci_dev_lock(hdev);

conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &ev->bdaddr);
if (!conn)
return;
goto unlock;

conn->passkey_notify = __le32_to_cpu(ev->passkey);
conn->passkey_entered = 0;
Expand All @@ -5506,6 +5508,9 @@ static void hci_user_passkey_notify_evt(struct hci_dev *hdev, void *data,
mgmt_user_passkey_notify(hdev, &conn->dst, conn->type,
conn->dst_type, conn->passkey_notify,
conn->passkey_entered);

unlock:
hci_dev_unlock(hdev);
}

static void hci_keypress_notify_evt(struct hci_dev *hdev, void *data,
Expand All @@ -5516,14 +5521,16 @@ static void hci_keypress_notify_evt(struct hci_dev *hdev, void *data,

bt_dev_dbg(hdev, "");

hci_dev_lock(hdev);

conn = hci_conn_hash_lookup_ba(hdev, ACL_LINK, &ev->bdaddr);
if (!conn)
return;
goto unlock;

switch (ev->type) {
case HCI_KEYPRESS_STARTED:
conn->passkey_entered = 0;
return;
goto unlock;

case HCI_KEYPRESS_ENTERED:
conn->passkey_entered++;
Expand All @@ -5538,13 +5545,16 @@ static void hci_keypress_notify_evt(struct hci_dev *hdev, void *data,
break;

case HCI_KEYPRESS_COMPLETED:
return;
goto unlock;
}

if (hci_dev_test_flag(hdev, HCI_MGMT))
mgmt_user_passkey_notify(hdev, &conn->dst, conn->type,
conn->dst_type, conn->passkey_notify,
conn->passkey_entered);

unlock:
hci_dev_unlock(hdev);
}

static void hci_simple_pair_complete_evt(struct hci_dev *hdev, void *data,
Expand Down
Loading