diff mbox series

[1/1] Bluetooth: hci_event: Fix use after free error

Message ID 20241204164840.14037-2-iulia.tanasescu@nxp.com
State New
Headers show
Series Bluetooth: hci_event: Fix use after free error | expand

Commit Message

Iulia Tanasescu Dec. 4, 2024, 4:48 p.m. UTC
This removes the hci_conn_del call while the conn_hash list is iterated
through, fixing the use after free error below:

[   82.961619] BUG: KASAN: slab-use-after-free in
               hci_le_create_big_complete_evt+0x900/0x9e0 [bluetooth]
[   82.961688] Read of size 8 at addr ffff88811fc0c000 by task
               kworker/u81:2/2806

[   82.961697] CPU: 10 UID: 0 PID: 2806 Comm: kworker/u81:2
[   82.961704] Tainted: [W]=WARN
[   82.961707] Hardware name: Dell Inc. Precision 3571/07K1M2,
               BIOS 1.11.0 12/12/2022
[   82.961711] Workqueue: hci0 hci_rx_work [bluetooth]
[   82.961780] Call Trace:
[   82.961783]  <TASK>
[   82.961787]  dump_stack_lvl+0x91/0xf0
[   82.961796]  print_report+0xd1/0x670
[   82.961803]  ? __virt_addr_valid+0x23a/0x440
[   82.961810]  ? kasan_complete_mode_report_info+0x6a/0x200
[   82.961816]  kasan_report+0xed/0x130
[   82.961821]  ? hci_le_create_big_complete_evt+0x900/0x9e0 [bluetooth]
[   82.961900]  ? hci_le_create_big_complete_evt+0x900/0x9e0 [bluetooth]
[   82.961963]  ? hci_le_create_big_complete_evt+0x427/0x9e0 [bluetooth]
[   82.962009]  __asan_report_load8_noabort+0x14/0x30
[   82.962012]  hci_le_create_big_complete_evt+0x900/0x9e0 [bluetooth]
[   82.962080]  ? __pfx_hci_le_create_big_complete_evt+0x10/0x10
                [bluetooth]
[   82.962130]  hci_le_meta_evt+0x26c/0x660 [bluetooth]
[   82.962194]  ? __pfx_hci_le_create_big_complete_evt+0x10/0x10
                [bluetooth]
[   82.962245]  hci_event_packet+0x55e/0x10c0 [bluetooth]
[   82.962291]  ? __pfx_hci_le_meta_evt+0x10/0x10 [bluetooth]
[   82.962337]  ? __pfx_hci_event_packet+0x10/0x10 [bluetooth]
[   82.962389]  ? __kasan_check_read+0x11/0x20
[   82.962395]  hci_rx_work+0x365/0x1310 [bluetooth]
[   82.962471]  ? lock_acquire+0x7c/0xc0
[   82.962476]  process_one_work+0x859/0x1a10
[   82.962481]  ? __pfx_process_one_work+0x10/0x10
[   82.962483]  ? do_raw_spin_lock+0x137/0x290
[   82.962488]  ? assign_work+0x16f/0x280
[   82.962492]  ? lock_is_held_type+0xa3/0x130
[   82.962496]  worker_thread+0x6eb/0x11e0
[   82.962501]  ? __pfx_worker_thread+0x10/0x10
[   82.962503]  kthread+0x2f0/0x3e0
[   82.962506]  ? __pfx_kthread+0x10/0x10
[   82.962509]  ret_from_fork+0x44/0x90
[   82.962513]  ? __pfx_kthread+0x10/0x10
[   82.962516]  ret_from_fork_asm+0x1a/0x30
[   82.962525]  </TASK>

[   82.962531] Allocated by task 3161:
[   82.962535]  kasan_save_stack+0x39/0x70
[   82.962540]  kasan_save_track+0x14/0x40
[   82.962544]  kasan_save_alloc_info+0x37/0x60
[   82.962548]  __kasan_kmalloc+0xc3/0xd0
[   82.962552]  __kmalloc_cache_noprof+0x196/0x3e0
[   82.962557]  __hci_conn_add+0x163/0x18c0 [bluetooth]
[   82.962634]  hci_conn_add_unset+0x53/0xe0 [bluetooth]
[   82.962708]  hci_bind_bis+0x9b2/0x1a40 [bluetooth]
[   82.962783]  iso_sock_connect+0x7a9/0xd10 [bluetooth]
[   82.962853]  __sys_connect_file+0x145/0x1b0
[   82.962859]  __sys_connect+0x113/0x140
[   82.962864]  __x64_sys_connect+0x72/0xc0
[   82.962868]  x64_sys_call+0x21c0/0x25f0
[   82.962873]  do_syscall_64+0x87/0x150
[   82.962878]  entry_SYSCALL_64_after_hwframe+0x76/0x7e

[   82.962886] Freed by task 2806:
[   82.962889]  kasan_save_stack+0x39/0x70
[   82.962893]  kasan_save_track+0x14/0x40
[   82.962898]  kasan_save_free_info+0x3b/0x60
[   82.962901]  __kasan_slab_free+0x52/0x80
[   82.962906]  kfree+0x148/0x480
[   82.962910]  bt_link_release+0x15/0x20 [bluetooth]
[   82.962983]  device_release+0x9d/0x220
[   82.962988]  kobject_put+0x18a/0x470
[   82.962992]  put_device+0x13/0x30
[   82.962996]  hci_conn_del_sysfs+0x114/0x150 [bluetooth]
[   82.963072]  hci_conn_del+0x366/0xc00 [bluetooth]
[   82.963145]  hci_le_create_big_complete_evt+0x43c/0x9e0 [bluetooth]
[   82.963217]  hci_le_meta_evt+0x26c/0x660 [bluetooth]
[   82.963290]  hci_event_packet+0x55e/0x10c0 [bluetooth]
[   82.963345]  hci_rx_work+0x365/0x1310 [bluetooth]
[   82.963389]  process_one_work+0x859/0x1a10
[   82.963391]  worker_thread+0x6eb/0x11e0
[   82.963394]  kthread+0x2f0/0x3e0
[   82.963396]  ret_from_fork+0x44/0x90
[   82.963399]  ret_from_fork_asm+0x1a/0x30

[   82.963403] Last potentially related work creation:
[   82.963405]  kasan_save_stack+0x39/0x70
[   82.963408]  __kasan_record_aux_stack+0xae/0xd0
[   82.963410]  kasan_record_aux_stack_noalloc+0xb/0x20
[   82.963413]  __queue_work+0x318/0x1100
[   82.963415]  __queue_delayed_work+0x1cf/0x2d0
[   82.963417]  queue_delayed_work_on+0x8c/0xd0
[   82.963419]  iso_conn_put+0x256/0x460 [bluetooth]
[   82.963460]  iso_chan_del+0x9a/0x240 [bluetooth]
[   82.963499]  iso_conn_del+0x149/0x280 [bluetooth]
[   82.963538]  iso_connect_cfm+0x374/0x1430 [bluetooth]
[   82.963577]  hci_le_create_big_complete_evt+0x39b/0x9e0 [bluetooth]
[   82.963622]  hci_le_meta_evt+0x26c/0x660 [bluetooth]
[   82.963667]  hci_event_packet+0x55e/0x10c0 [bluetooth]
[   82.963713]  hci_rx_work+0x365/0x1310 [bluetooth]
[   82.963756]  process_one_work+0x859/0x1a10
[   82.963758]  worker_thread+0x6eb/0x11e0
[   82.963760]  kthread+0x2f0/0x3e0
[   82.963762]  ret_from_fork+0x44/0x90
[   82.963765]  ret_from_fork_asm+0x1a/0x30

Fixes: a0bfde167b50 ("Bluetooth: ISO: Add support for connecting multiple BISes")
Signed-off-by: Iulia Tanasescu <iulia.tanasescu@nxp.com>
---
 net/bluetooth/hci_event.c | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

Comments

Luiz Augusto von Dentz Dec. 4, 2024, 4:57 p.m. UTC | #1
Hi Iulia,

On Wed, Dec 4, 2024 at 11:48 AM Iulia Tanasescu <iulia.tanasescu@nxp.com> wrote:
>
> This removes the hci_conn_del call while the conn_hash list is iterated
> through, fixing the use after free error below:
>
> [   82.961619] BUG: KASAN: slab-use-after-free in
>                hci_le_create_big_complete_evt+0x900/0x9e0 [bluetooth]
> [   82.961688] Read of size 8 at addr ffff88811fc0c000 by task
>                kworker/u81:2/2806
>
> [   82.961697] CPU: 10 UID: 0 PID: 2806 Comm: kworker/u81:2
> [   82.961704] Tainted: [W]=WARN
> [   82.961707] Hardware name: Dell Inc. Precision 3571/07K1M2,
>                BIOS 1.11.0 12/12/2022
> [   82.961711] Workqueue: hci0 hci_rx_work [bluetooth]
> [   82.961780] Call Trace:
> [   82.961783]  <TASK>
> [   82.961787]  dump_stack_lvl+0x91/0xf0
> [   82.961796]  print_report+0xd1/0x670
> [   82.961803]  ? __virt_addr_valid+0x23a/0x440
> [   82.961810]  ? kasan_complete_mode_report_info+0x6a/0x200
> [   82.961816]  kasan_report+0xed/0x130
> [   82.961821]  ? hci_le_create_big_complete_evt+0x900/0x9e0 [bluetooth]
> [   82.961900]  ? hci_le_create_big_complete_evt+0x900/0x9e0 [bluetooth]
> [   82.961963]  ? hci_le_create_big_complete_evt+0x427/0x9e0 [bluetooth]
> [   82.962009]  __asan_report_load8_noabort+0x14/0x30
> [   82.962012]  hci_le_create_big_complete_evt+0x900/0x9e0 [bluetooth]
> [   82.962080]  ? __pfx_hci_le_create_big_complete_evt+0x10/0x10
>                 [bluetooth]
> [   82.962130]  hci_le_meta_evt+0x26c/0x660 [bluetooth]
> [   82.962194]  ? __pfx_hci_le_create_big_complete_evt+0x10/0x10
>                 [bluetooth]
> [   82.962245]  hci_event_packet+0x55e/0x10c0 [bluetooth]
> [   82.962291]  ? __pfx_hci_le_meta_evt+0x10/0x10 [bluetooth]
> [   82.962337]  ? __pfx_hci_event_packet+0x10/0x10 [bluetooth]
> [   82.962389]  ? __kasan_check_read+0x11/0x20
> [   82.962395]  hci_rx_work+0x365/0x1310 [bluetooth]
> [   82.962471]  ? lock_acquire+0x7c/0xc0
> [   82.962476]  process_one_work+0x859/0x1a10
> [   82.962481]  ? __pfx_process_one_work+0x10/0x10
> [   82.962483]  ? do_raw_spin_lock+0x137/0x290
> [   82.962488]  ? assign_work+0x16f/0x280
> [   82.962492]  ? lock_is_held_type+0xa3/0x130
> [   82.962496]  worker_thread+0x6eb/0x11e0
> [   82.962501]  ? __pfx_worker_thread+0x10/0x10
> [   82.962503]  kthread+0x2f0/0x3e0
> [   82.962506]  ? __pfx_kthread+0x10/0x10
> [   82.962509]  ret_from_fork+0x44/0x90
> [   82.962513]  ? __pfx_kthread+0x10/0x10
> [   82.962516]  ret_from_fork_asm+0x1a/0x30
> [   82.962525]  </TASK>
>
> [   82.962531] Allocated by task 3161:
> [   82.962535]  kasan_save_stack+0x39/0x70
> [   82.962540]  kasan_save_track+0x14/0x40
> [   82.962544]  kasan_save_alloc_info+0x37/0x60
> [   82.962548]  __kasan_kmalloc+0xc3/0xd0
> [   82.962552]  __kmalloc_cache_noprof+0x196/0x3e0
> [   82.962557]  __hci_conn_add+0x163/0x18c0 [bluetooth]
> [   82.962634]  hci_conn_add_unset+0x53/0xe0 [bluetooth]
> [   82.962708]  hci_bind_bis+0x9b2/0x1a40 [bluetooth]
> [   82.962783]  iso_sock_connect+0x7a9/0xd10 [bluetooth]
> [   82.962853]  __sys_connect_file+0x145/0x1b0
> [   82.962859]  __sys_connect+0x113/0x140
> [   82.962864]  __x64_sys_connect+0x72/0xc0
> [   82.962868]  x64_sys_call+0x21c0/0x25f0
> [   82.962873]  do_syscall_64+0x87/0x150
> [   82.962878]  entry_SYSCALL_64_after_hwframe+0x76/0x7e
>
> [   82.962886] Freed by task 2806:
> [   82.962889]  kasan_save_stack+0x39/0x70
> [   82.962893]  kasan_save_track+0x14/0x40
> [   82.962898]  kasan_save_free_info+0x3b/0x60
> [   82.962901]  __kasan_slab_free+0x52/0x80
> [   82.962906]  kfree+0x148/0x480
> [   82.962910]  bt_link_release+0x15/0x20 [bluetooth]
> [   82.962983]  device_release+0x9d/0x220
> [   82.962988]  kobject_put+0x18a/0x470
> [   82.962992]  put_device+0x13/0x30
> [   82.962996]  hci_conn_del_sysfs+0x114/0x150 [bluetooth]
> [   82.963072]  hci_conn_del+0x366/0xc00 [bluetooth]
> [   82.963145]  hci_le_create_big_complete_evt+0x43c/0x9e0 [bluetooth]
> [   82.963217]  hci_le_meta_evt+0x26c/0x660 [bluetooth]
> [   82.963290]  hci_event_packet+0x55e/0x10c0 [bluetooth]
> [   82.963345]  hci_rx_work+0x365/0x1310 [bluetooth]
> [   82.963389]  process_one_work+0x859/0x1a10
> [   82.963391]  worker_thread+0x6eb/0x11e0
> [   82.963394]  kthread+0x2f0/0x3e0
> [   82.963396]  ret_from_fork+0x44/0x90
> [   82.963399]  ret_from_fork_asm+0x1a/0x30
>
> [   82.963403] Last potentially related work creation:
> [   82.963405]  kasan_save_stack+0x39/0x70
> [   82.963408]  __kasan_record_aux_stack+0xae/0xd0
> [   82.963410]  kasan_record_aux_stack_noalloc+0xb/0x20
> [   82.963413]  __queue_work+0x318/0x1100
> [   82.963415]  __queue_delayed_work+0x1cf/0x2d0
> [   82.963417]  queue_delayed_work_on+0x8c/0xd0
> [   82.963419]  iso_conn_put+0x256/0x460 [bluetooth]
> [   82.963460]  iso_chan_del+0x9a/0x240 [bluetooth]
> [   82.963499]  iso_conn_del+0x149/0x280 [bluetooth]
> [   82.963538]  iso_connect_cfm+0x374/0x1430 [bluetooth]
> [   82.963577]  hci_le_create_big_complete_evt+0x39b/0x9e0 [bluetooth]
> [   82.963622]  hci_le_meta_evt+0x26c/0x660 [bluetooth]
> [   82.963667]  hci_event_packet+0x55e/0x10c0 [bluetooth]
> [   82.963713]  hci_rx_work+0x365/0x1310 [bluetooth]
> [   82.963756]  process_one_work+0x859/0x1a10
> [   82.963758]  worker_thread+0x6eb/0x11e0
> [   82.963760]  kthread+0x2f0/0x3e0
> [   82.963762]  ret_from_fork+0x44/0x90
> [   82.963765]  ret_from_fork_asm+0x1a/0x30
>
> Fixes: a0bfde167b50 ("Bluetooth: ISO: Add support for connecting multiple BISes")
> Signed-off-by: Iulia Tanasescu <iulia.tanasescu@nxp.com>
> ---
>  net/bluetooth/hci_event.c | 30 ++++++++++++++++--------------
>  1 file changed, 16 insertions(+), 14 deletions(-)
>
> diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
> index aca121408369..8735264ccd8b 100644
> --- a/net/bluetooth/hci_event.c
> +++ b/net/bluetooth/hci_event.c
> @@ -6872,6 +6872,15 @@ static void hci_le_create_big_complete_evt(struct hci_dev *hdev, void *data,
>                 return;
>
>         hci_dev_lock(hdev);
> +
> +       if (ev->status) {
> +               while ((conn = hci_conn_hash_lookup_big_state(hdev,
> +                                                             ev->handle,
> +                                                             BT_BOUND)))
> +                       hci_conn_failed(conn, ev->status);
> +               goto unlock;
> +       }
> +

Oh, Im working on a very similar fix actually, but Im taking away the
entire block of rcu_read_lock, will send it shortly.

>         rcu_read_lock();
>
>         /* Connect all BISes that are bound to the BIG */
> @@ -6885,26 +6894,18 @@ static void hci_le_create_big_complete_evt(struct hci_dev *hdev, void *data,
>                                         __le16_to_cpu(ev->bis_handle[i++])))
>                         continue;
>
> -               if (!ev->status) {
> -                       conn->state = BT_CONNECTED;
> -                       set_bit(HCI_CONN_BIG_CREATED, &conn->flags);
> -                       rcu_read_unlock();
> -                       hci_debugfs_create_conn(conn);
> -                       hci_conn_add_sysfs(conn);
> -                       hci_iso_setup_path(conn);
> -                       rcu_read_lock();
> -                       continue;
> -               }
> -
> -               hci_connect_cfm(conn, ev->status);
> +               conn->state = BT_CONNECTED;
> +               set_bit(HCI_CONN_BIG_CREATED, &conn->flags);
>                 rcu_read_unlock();
> -               hci_conn_del(conn);
> +               hci_debugfs_create_conn(conn);
> +               hci_conn_add_sysfs(conn);
> +               hci_iso_setup_path(conn);
>                 rcu_read_lock();
>         }
>
>         rcu_read_unlock();
>
> -       if (!ev->status && !i)
> +       if (!i)
>                 /* If no BISes have been connected for the BIG,
>                  * terminate. This is in case all bound connections
>                  * have been closed before the BIG creation
> @@ -6913,6 +6914,7 @@ static void hci_le_create_big_complete_evt(struct hci_dev *hdev, void *data,
>                 hci_cmd_sync_queue(hdev, hci_iso_term_big_sync,
>                                    UINT_PTR(ev->handle), NULL);
>
> +unlock:
>         hci_dev_unlock(hdev);
>  }
>
> --
> 2.43.0
>
bluez.test.bot@gmail.com Dec. 4, 2024, 5:31 p.m. UTC | #2
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=914650

---Test result---

Test Summary:
CheckPatch                    PENDING   0.27 seconds
GitLint                       PENDING   0.20 seconds
SubjectPrefix                 PASS      0.12 seconds
BuildKernel                   PASS      25.29 seconds
CheckAllWarning               PASS      27.53 seconds
CheckSparse                   WARNING   31.11 seconds
BuildKernel32                 PASS      24.92 seconds
TestRunnerSetup               PASS      441.77 seconds
TestRunner_l2cap-tester       PASS      20.61 seconds
TestRunner_iso-tester         FAIL      26.48 seconds
TestRunner_bnep-tester        PASS      4.84 seconds
TestRunner_mgmt-tester        FAIL      119.73 seconds
TestRunner_rfcomm-tester      PASS      7.69 seconds
TestRunner_sco-tester         PASS      9.59 seconds
TestRunner_ioctl-tester       PASS      8.16 seconds
TestRunner_mesh-tester        PASS      6.07 seconds
TestRunner_smp-tester         PASS      7.07 seconds
TestRunner_userchan-tester    PASS      5.10 seconds
IncrementalBuild              PENDING   0.48 seconds

Details
##############################
Test: CheckPatch - PENDING
Desc: Run checkpatch.pl script
Output:

##############################
Test: GitLint - PENDING
Desc: Run gitlint
Output:

##############################
Test: CheckSparse - WARNING
Desc: Run sparse tool with linux kernel
Output:
net/bluetooth/hci_event.c: note: in included file (through include/net/bluetooth/hci_core.h):
##############################
Test: TestRunner_iso-tester - FAIL
Desc: Run iso-tester with test-runner
Output:
WARNING: possible circular locking dependency detected
Total: 125, Passed: 121 (96.8%), Failed: 0, Not Run: 4
##############################
Test: TestRunner_mgmt-tester - FAIL
Desc: Run mgmt-tester with test-runner
Output:
Total: 492, Passed: 487 (99.0%), Failed: 1, Not Run: 4

Failed Test Cases
LL Privacy - Start Discovery 2 (Disable RL)          Failed       0.187 seconds
##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series
Output:



---
Regards,
Linux Bluetooth
diff mbox series

Patch

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index aca121408369..8735264ccd8b 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -6872,6 +6872,15 @@  static void hci_le_create_big_complete_evt(struct hci_dev *hdev, void *data,
 		return;
 
 	hci_dev_lock(hdev);
+
+	if (ev->status) {
+		while ((conn = hci_conn_hash_lookup_big_state(hdev,
+							      ev->handle,
+							      BT_BOUND)))
+			hci_conn_failed(conn, ev->status);
+		goto unlock;
+	}
+
 	rcu_read_lock();
 
 	/* Connect all BISes that are bound to the BIG */
@@ -6885,26 +6894,18 @@  static void hci_le_create_big_complete_evt(struct hci_dev *hdev, void *data,
 					__le16_to_cpu(ev->bis_handle[i++])))
 			continue;
 
-		if (!ev->status) {
-			conn->state = BT_CONNECTED;
-			set_bit(HCI_CONN_BIG_CREATED, &conn->flags);
-			rcu_read_unlock();
-			hci_debugfs_create_conn(conn);
-			hci_conn_add_sysfs(conn);
-			hci_iso_setup_path(conn);
-			rcu_read_lock();
-			continue;
-		}
-
-		hci_connect_cfm(conn, ev->status);
+		conn->state = BT_CONNECTED;
+		set_bit(HCI_CONN_BIG_CREATED, &conn->flags);
 		rcu_read_unlock();
-		hci_conn_del(conn);
+		hci_debugfs_create_conn(conn);
+		hci_conn_add_sysfs(conn);
+		hci_iso_setup_path(conn);
 		rcu_read_lock();
 	}
 
 	rcu_read_unlock();
 
-	if (!ev->status && !i)
+	if (!i)
 		/* If no BISes have been connected for the BIG,
 		 * terminate. This is in case all bound connections
 		 * have been closed before the BIG creation
@@ -6913,6 +6914,7 @@  static void hci_le_create_big_complete_evt(struct hci_dev *hdev, void *data,
 		hci_cmd_sync_queue(hdev, hci_iso_term_big_sync,
 				   UINT_PTR(ev->handle), NULL);
 
+unlock:
 	hci_dev_unlock(hdev);
 }