Commit fb19d552 authored by Luiz Augusto von Dentz's avatar Luiz Augusto von Dentz Committed by Wen Zhiwei
Browse files

Bluetooth: hci_sync: Fix UAF on hci_abort_conn_sync 

stable inclusion
from stable-v6.6.51
commit 611e4281117ab749b713723311de3ed8ed3ad031
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAYRVR

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=611e4281117ab749b713723311de3ed8ed3ad031



--------------------------------

commit 7453847fb22c7c45334c43cc6a02ea5df5b9961d upstream.

Fixes the following trace where hci_acl_create_conn_sync attempts to
call hci_abort_conn_sync after timeout:

BUG: KASAN: slab-use-after-free in hci_abort_conn_sync
(net/bluetooth/hci_sync.c:5439)
Read of size 2 at addr ffff88800322c032 by task kworker/u3:2/36

Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.2-1.fc38
04/01/2014
Workqueue: hci0 hci_cmd_sync_work
Call Trace:
<TASK>
dump_stack_lvl (./arch/x86/include/asm/irqflags.h:26
./arch/x86/include/asm/irqflags.h:67 ./arch/x86/include/asm/irqflags.h:127
lib/dump_stack.c:107)
print_report (mm/kasan/report.c:378 mm/kasan/report.c:488)
? preempt_count_sub (kernel/sched/core.c:5889)
? __virt_addr_valid (./arch/x86/include/asm/preempt.h:103 (discriminator 1)
./include/linux/rcupdate.h:865 (discriminator 1)
./include/linux/mmzone.h:2026 (discriminator 1)
arch/x86/mm/physaddr.c:65 (discriminator 1))
? hci_abort_conn_sync (net/bluetooth/hci_sync.c:5439)
kasan_report (mm/kasan/report.c:603)
? hci_abort_conn_sync (net/bluetooth/hci_sync.c:5439)
hci_abort_conn_sync (net/bluetooth/hci_sync.c:5439)
? __pfx_hci_abort_conn_sync (net/bluetooth/hci_sync.c:5433)
hci_acl_create_conn_sync (net/bluetooth/hci_sync.c:6681)

Fixes: 45340097ce6e ("Bluetooth: hci_conn: Only do ACL connections sequentially")
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 03b4306c

net/bluetooth/hci_sync.c

+4 −9
Original line number Diff line number Diff line
@@ -6796,15 +6796,10 @@ static int hci_acl_create_conn_sync(struct hci_dev *hdev, void *data) 
	else

		cp.role_switch = 0x00;



	err = __hci_cmd_sync_status_sk(hdev, HCI_OP_CREATE_CONN,

	return __hci_cmd_sync_status_sk(hdev, HCI_OP_CREATE_CONN,

					sizeof(cp), &cp,

					HCI_EV_CONN_COMPLETE,

				       HCI_ACL_CONN_TIMEOUT, NULL);



	if (err == -ETIMEDOUT)

		hci_abort_conn_sync(hdev, conn, HCI_ERROR_LOCAL_HOST_TERM);



	return err;

					conn->conn_timeout, NULL);

}



int hci_connect_acl_sync(struct hci_dev *hdev, struct hci_conn *conn)