Bluetooth: hci_event: fix potential UAF in SSP passkey handlers
Subsystems (2)
PATCH 1/1 Bluetooth: hci_event: fix potential UAF in SSP passkey handlers
hci_conn lookup and field access must be covered by hdev lock in hci_user_passkey_notify_evt() and hci_keypress_notify_evt(), otherwise the connection can be freed concurrently.
Extend the hci_dev_lock critical section to cover all conn usage in both handlers.
Keep the existing keypress notification behavior unchanged by routing the early exits through a common unlock path.
--- net/bluetooth/hci_event.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-)
net/bluetooth/hci_event.c +14 -4
@@ -5496,39 +5496,46 @@ static void hci_user_passkey_notify_evt(struct hci_dev *hdev, void *data,struct hci_ev_user_passkey_notify *ev = data;struct hci_conn *conn;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 ;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_keypress_notify_evt (struct hci_dev *hdev,void *data,struct sk_buff *skb) {struct hci_ev_keypress_notify *ev = data;struct hci_conn *conn;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++;break ;
@@ -5539,17 +5546,20 @@ static void hci_keypress_notify_evt(struct hci_dev *hdev, void *data,case HCI_KEYPRESS_CLEARED : conn->passkey_entered =0 ;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,struct sk_buff *skb) {
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=1078865
---Test result---
Test Summary:
CheckPatch PENDING 0.49 seconds GitLint PENDING 0.28 seconds SubjectPrefix PASS 0.26 seconds BuildKernel PASS 25.88 seconds CheckAllWarning PASS 28.13 seconds CheckSparse PASS 27.57 seconds BuildKernel32 PASS 24.83 seconds TestRunnerSetup PASS 567.22 seconds TestRunner_l2cap-tester PASS 27.70 seconds TestRunner_iso-tester PASS 37.67 seconds TestRunner_bnep-tester PASS 6.40 seconds TestRunner_mgmt-tester FAIL 113.44 seconds TestRunner_rfcomm-tester PASS 9.37 seconds TestRunner_sco-tester FAIL 14.29 seconds TestRunner_ioctl-tester PASS 10.35 seconds TestRunner_mesh-tester FAIL 11.48 seconds TestRunner_smp-tester PASS 8.62 seconds TestRunner_userchan-tester PASS 6.77 seconds IncrementalBuild PENDING 0.64 seconds
Details
##############################
Test: CheckPatch - PENDING
Desc: Run checkpatch.pl script
Output:
##############################
Test: GitLint - PENDING
Desc: Run gitlint
Output:
##############################
Test: TestRunner_mgmt-tester - FAIL
Desc: Run mgmt-tester with test-runner Output:
Total: 494, Passed: 489 (99.0%), Failed: 1, Not Run: 4
Failed Test Cases
Read Exp Feature - Success Failed 0.107 seconds
##############################
Test: TestRunner_sco-tester - FAIL
Desc: Run sco-tester with test-runner
Output:
WARNING: possible circular locking dependency detected
BUG: sleeping function called from invalid context at net/core/sock.c:3782
Total: 30, Passed: 30 (100.0%), Failed: 0, Not Run: 0
##############################
Test: TestRunner_mesh-tester - FAIL
Desc: Run mesh-tester with test-runner Output:
Total: 10, Passed: 8 (80.0%), Failed: 2, Not Run: 0
Failed Test Cases
Mesh - Send cancel - 1 Timed out 1.860 seconds Mesh - Send cancel - 2 Timed out 1.992 seconds
##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series Output:
---
Regards,
Linux Bluetooth
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=1078865
---Test result---
Test Summary:
CheckPatch PENDING 0.46 seconds GitLint PENDING 0.28 seconds SubjectPrefix PASS 0.13 seconds BuildKernel PASS 24.90 seconds CheckAllWarning PASS 27.17 seconds CheckSparse PASS 26.39 seconds BuildKernel32 PASS 24.20 seconds TestRunnerSetup PASS 517.50 seconds TestRunner_l2cap-tester PASS 29.54 seconds TestRunner_iso-tester PASS 40.79 seconds TestRunner_bnep-tester PASS 6.29 seconds TestRunner_mgmt-tester FAIL 113.79 seconds TestRunner_rfcomm-tester PASS 9.42 seconds TestRunner_sco-tester FAIL 14.19 seconds TestRunner_ioctl-tester PASS 10.11 seconds TestRunner_mesh-tester FAIL 11.52 seconds TestRunner_smp-tester PASS 8.62 seconds TestRunner_userchan-tester PASS 9.65 seconds TestRunner_6lowpan-tester FAIL 8.59 seconds IncrementalBuild PENDING 0.29 seconds
Details
##############################
Test: CheckPatch - PENDING
Desc: Run checkpatch.pl script
Output:
##############################
Test: GitLint - PENDING
Desc: Run gitlint
Output:
##############################
Test: TestRunner_mgmt-tester - FAIL
Desc: Run mgmt-tester with test-runner Output:
Total: 494, Passed: 489 (99.0%), Failed: 1, Not Run: 4
Failed Test Cases
Read Exp Feature - Success Failed 0.106 seconds
##############################
Test: TestRunner_sco-tester - FAIL
Desc: Run sco-tester with test-runner
Output:
WARNING: possible circular locking dependency detected
7.0.0-rc2-g2db23f73a0dd #1 Not tainted
------------------------------------------------------
kworker/u5:2/117 is trying to acquire lock:ffff888001abe240 (sk_lock-AF_BLUETOOTH-BTPROTO_SCO){+.+.}-{0:0}, at: sco_connect_cfm+0x358/0x8d0
but task is already holding lock:ffff888002094c20 (&conn->lock){+.+.}-{3:3}, at: sco_connect_cfm+0x22d/0x8d0
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #1 (&conn->lock){+.+.}-{3:3}:
lock_acquire+0xf7/0x2c0
_raw_spin_lock+0x2a/0x40
sco_sock_connect+0x4d7/0x1280
__sys_connect+0x1a3/0x260
__x64_sys_connect+0x6e/0xb0
do_syscall_64+0xa0/0x570
entry_SYSCALL_64_after_hwframe+0x74/0x7c-> #0 (sk_lock-AF_BLUETOOTH-BTPROTO_SCO){+.+.}-{0:0}:
check_prev_add+0xe9/0xc70
__lock_acquire+0x1457/0x1df0
lock_acquire+0xf7/0x2c0
lock_sock_nested+0x36/0xd0
sco_connect_cfm+0x358/0x8d0
hci_sync_conn_complete_evt+0x3d3/0x8e0
hci_event_packet+0x74f/0xb10
hci_rx_work+0x398/0xd00
process_scheduled_works+0xb16/0x1ac0
worker_thread+0x4ff/0xba0
kthread+0x368/0x490
ret_from_fork+0x498/0x7e0
ret_from_fork_asm+0x19/0x30other info that might help us debug this:
...
BUG: sleeping function called from invalid context at net/core/sock.c:3782
in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 117, name: kworker/u5:2preempt_count: 1, expected: 0
RCU nest depth: 0, expected: 0
INFO: lockdep is turned off.
CPU: 0 UID: 0 PID: 117 Comm: kworker/u5:2 Not tainted 7.0.0-rc2-g2db23f73a0dd #1 PREEMPT(lazy) Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.13.0-1ubuntu1.1 04/01/2014 Workqueue: hci0 hci_rx_work Call Trace: <TASK> dump_stack_lvl+0x49/0x60 __might_resched+0x2ea/0x500 lock_sock_nested+0x47/0xd0 ? sco_connect_cfm+0x358/0x8d0 sco_connect_cfm+0x358/0x8d0 ? hci_debugfs_create_conn+0x190/0x210 ? __pfx_sco_connect_cfm+0x10/0x10 hci_sync_conn_complete_evt+0x3d3/0x8e0 hci_event_packet+0x74f/0xb10 ? __pfx_hci_sync_conn_complete_evt+0x10/0x10 ? __pfx_hci_event_packet+0x10/0x10 ? mark_held_locks+0x49/0x80 ? lockdep_hardirqs_on_prepare+0xd4/0x180 ? _raw_spin_unlock_irqrestore+0x2c/0x50 hci_rx_work+0x398/0xd00 process_scheduled_works+0xb16/0x1ac0 ? __pfx_process_scheduled_works+0x10/0x10 ? lock_acquire+0xf7/0x2c0 ? lock_is_held_type+0x9b/0x110 ? __pfx_hci_rx_work+0x10/0x10 worker_thread+0x4ff/0xba0 ? _raw_spin_unlock_irqrestore+0x2c/0x50 ? __pfx_worker_thread+0x10/0x10 kthread+0x368/0x490 ? _raw_spin_unlock_irq+0x23/0x40 ? __pfx_kthread+0x10/0x10 ret_from_fork+0x498/0x7e0 ? __pfx_ret_from_fork+0x10/0x10 ? __switch_to+0x9e4/0xe50 ? __switch_to_asm+0x32/0x60
...
Total: 30, Passed: 30 (100.0%), Failed: 0, Not Run: 0
##############################
Test: TestRunner_mesh-tester - FAIL
Desc: Run mesh-tester with test-runner Output:
Total: 10, Passed: 8 (80.0%), Failed: 2, Not Run: 0
Failed Test Cases
Mesh - Send cancel - 1 Timed out 1.886 seconds Mesh - Send cancel - 2 Timed out 1.996 seconds
##############################
Test: TestRunner_6lowpan-tester - FAIL
Desc: Run 6lowpan-tester with test-runner
Output:
WARNING: possible circular locking dependency detected 7.0.0-rc2-g2db23f73a0dd #1 Not tainted
------------------------------------------------------
kworker/0:1/11 is trying to acquire lock:ffff8880026e8940 ((wq_completion)hci0#2){+.+.}-{0:0}, at: touch_wq_lockdep_map+0x75/0x180
but task is already holding lock:ffffffff9a24d720 (rtnl_mutex){+.+.}-{4:4}, at: lowpan_unregister_netdev+0xd/0x30
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #4 (rtnl_mutex){+.+.}-{4:4}:
lock_acquire+0xf7/0x2c0
__mutex_lock+0x16b/0x1fc0
lowpan_register_netdev+0x11/0x30
chan_ready_cb+0x836/0xd00
l2cap_recv_frame+0x6a06/0x8920
l2cap_recv_acldata+0x790/0xdf0
hci_rx_work+0x500/0xd00
process_scheduled_works+0xb16/0x1ac0
worker_thread+0x4ff/0xba0
kthread+0x368/0x490
ret_from_fork+0x498/0x7e0
ret_from_fork_asm+0x19/0x30-> #3 (&chan->lock#3/1){+.+.}-{4:4}:
lock_acquire+0xf7/0x2c0
__mutex_lock+0x16b/0x1fc0
l2cap_chan_connect+0x74e/0x1980
lowpan_control_write+0x523/0x660
full_proxy_write+0x10b/0x190
vfs_write+0x1c0/0xf60
ksys_write+0xf1/0x1d0
do_syscall_64+0xa0/0x570
entry_SYSCALL_64_after_hwframe+0x74/0x7c-> #2 (&conn->lock){+.+.}-{4:4}:
...
Total: 8, Passed: 8 (100.0%), Failed: 0, Not Run: 0
##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series Output:
https://github.com/bluez/bluetooth-next/pull/55/checks
---
Regards,
Linux Bluetooth