From patchwork Wed Aug 9 23:56:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Augusto von Dentz X-Patchwork-Id: 13348638 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF613C001B0 for ; Wed, 9 Aug 2023 23:56:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231446AbjHIX4a (ORCPT ); Wed, 9 Aug 2023 19:56:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229545AbjHIX4a (ORCPT ); Wed, 9 Aug 2023 19:56:30 -0400 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C875810C for ; Wed, 9 Aug 2023 16:56:25 -0700 (PDT) Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-686efa1804eso258286b3a.3 for ; Wed, 09 Aug 2023 16:56:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691625384; x=1692230184; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=NKCzsCtYyr2xu7CEyCPSXJWDiju4qWWMh3xrYrMzxoY=; b=PjIz/oS1lkNsJjzX5dwDNQI4a6IUJGZsbdsGTLHnOFUJiEV9YaZj8TgGZ41QRamDd1 os3l3FKnraSHmVr0ekGxBiNZ2Xs8qZmmopE52SUj1CMTzeaPYK7YNckyI3VN85geLOJw cGYtkxViUDLSH5OSlWex+xFcGs4plomdOiJkZGhMRY6Qjf/S/BuisqDfHLWL55lXaQDt BDgHzK/EC+9MHa6XQ5BuTHUJselSnQJ9p/adY8lw2FnkCO6LUzN8BNnrSM+8wt9dFGjl IIuG7Fd+5B/1WvlmiNyyha0UH/KHew4MwQxZZ4WzENE0rTjBHAR7kYvGmlQYxFCoTAVl 7+SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691625384; x=1692230184; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=NKCzsCtYyr2xu7CEyCPSXJWDiju4qWWMh3xrYrMzxoY=; b=crVJLkQf7K8YjdMMQBe2x9J01XDAhQ/1zdJtOhni+aBioojwenZRBy8wu9DTpPMQDH IE08Je/cLcmqdga1vl9+lVjZAyvPU5crXDEECiZMAoUXi9woVCGwEEk4DFAP1B05ARXH NhGlzNRBbFITjD4tM59rheFFKztyRNKK183ynKSnNv53dkzmDot+dwXM2DRUh9t1mqwl uBo+Hxa/3HBI/f220Tj+xKRLxTmoIl1v9BFb2O2236epJ6BVGbz5KwcVTmKcFp+BKkYi zLu8O83PjXIqNvBoth5i7d5bWDy2Sk412NCiOjWgD96dnIUsQKRKt+Z+O2YgJHEaZLSq vHkQ== X-Gm-Message-State: AOJu0YwT9gumY8Rst5EJcqnbPns32ZvBK+5axeT1STmwekuQLWGbVlLa Ws7JbHXKEStbPloPT2EM4SKHJlDNL14= X-Google-Smtp-Source: AGHT+IHjbdSFYW1/BDxyfhVQONljh8rQWofyQFH3qRBaP07PJe+507yrACxIn6usUpDmYq7do6Eypg== X-Received: by 2002:a05:6a20:3257:b0:13f:53b1:c05d with SMTP id hm23-20020a056a20325700b0013f53b1c05dmr710885pzc.47.1691625384429; Wed, 09 Aug 2023 16:56:24 -0700 (PDT) Received: from lvondent-mobl4.. (c-71-236-201-58.hsd1.or.comcast.net. [71.236.201.58]) by smtp.gmail.com with ESMTPSA id n5-20020aa78a45000000b0068675835e10sm157848pfa.44.2023.08.09.16.56.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Aug 2023 16:56:23 -0700 (PDT) From: Luiz Augusto von Dentz To: linux-bluetooth@vger.kernel.org Subject: [PATCH] Bluetooth: hci_sync: Fix UAF in hci_disconnect_all_sync Date: Wed, 9 Aug 2023 16:56:22 -0700 Message-ID: <20230809235622.1664227-1-luiz.dentz@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Luiz Augusto von Dentz Use-after-free can occur in hci_disconnect_all_sync if a connection is deleted by concurrent processing of a controller event. To prevent this the code now tries to iterate over the list backwards to ensure the links are cleanup before its parents, also it no longer relies on a cursor, instead it always uses the last element since hci_abort_conn_sync is guaranteed to call hci_conn_del. UAF crash log: ================================================================== BUG: KASAN: slab-use-after-free in hci_set_powered_sync (net/bluetooth/hci_sync.c:5424) [bluetooth] Read of size 8 at addr ffff888009d9c000 by task kworker/u9:0/124 CPU: 0 PID: 124 Comm: kworker/u9:0 Tainted: G W 6.5.0-rc1+ #10 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.2-1.fc38 04/01/2014 Workqueue: hci0 hci_cmd_sync_work [bluetooth] Call Trace: dump_stack_lvl+0x5b/0x90 print_report+0xcf/0x670 ? __virt_addr_valid+0xdd/0x160 ? hci_set_powered_sync+0x2c9/0x4a0 [bluetooth] kasan_report+0xa6/0xe0 ? hci_set_powered_sync+0x2c9/0x4a0 [bluetooth] ? __pfx_set_powered_sync+0x10/0x10 [bluetooth] hci_set_powered_sync+0x2c9/0x4a0 [bluetooth] ? __pfx_hci_set_powered_sync+0x10/0x10 [bluetooth] ? __pfx_lock_release+0x10/0x10 ? __pfx_set_powered_sync+0x10/0x10 [bluetooth] hci_cmd_sync_work+0x137/0x220 [bluetooth] process_one_work+0x526/0x9d0 ? __pfx_process_one_work+0x10/0x10 ? __pfx_do_raw_spin_lock+0x10/0x10 ? mark_held_locks+0x1a/0x90 worker_thread+0x92/0x630 ? __pfx_worker_thread+0x10/0x10 kthread+0x196/0x1e0 ? __pfx_kthread+0x10/0x10 ret_from_fork+0x2c/0x50 Allocated by task 1782: kasan_save_stack+0x33/0x60 kasan_set_track+0x25/0x30 __kasan_kmalloc+0x8f/0xa0 hci_conn_add+0xa5/0xa80 [bluetooth] hci_bind_cis+0x881/0x9b0 [bluetooth] iso_connect_cis+0x121/0x520 [bluetooth] iso_sock_connect+0x3f6/0x790 [bluetooth] __sys_connect+0x109/0x130 __x64_sys_connect+0x40/0x50 do_syscall_64+0x60/0x90 entry_SYSCALL_64_after_hwframe+0x6e/0xd8 Freed by task 695: kasan_save_stack+0x33/0x60 kasan_set_track+0x25/0x30 kasan_save_free_info+0x2b/0x50 __kasan_slab_free+0x10a/0x180 __kmem_cache_free+0x14d/0x2e0 device_release+0x5d/0xf0 kobject_put+0xdf/0x270 hci_disconn_complete_evt+0x274/0x3a0 [bluetooth] hci_event_packet+0x579/0x7e0 [bluetooth] hci_rx_work+0x287/0xaa0 [bluetooth] process_one_work+0x526/0x9d0 worker_thread+0x92/0x630 kthread+0x196/0x1e0 ret_from_fork+0x2c/0x50 ================================================================== Fixes: 182ee45da083 ("Bluetooth: hci_sync: Rework hci_suspend_notifier") Signed-off-by: Pauli Virtanen Signed-off-by: Luiz Augusto von Dentz --- net/bluetooth/hci_sync.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c index 32fa9006f381..234da30292a4 100644 --- a/net/bluetooth/hci_sync.c +++ b/net/bluetooth/hci_sync.c @@ -5429,7 +5429,11 @@ int hci_abort_conn_sync(struct hci_dev *hdev, struct hci_conn *conn, u8 reason) hci_dev_unlock(hdev); return 0; default: + hci_dev_lock(hdev); conn->state = BT_CLOSED; + hci_disconn_cfm(conn, reason); + hci_conn_del(conn); + hci_dev_unlock(hdev); return 0; } @@ -5458,13 +5462,19 @@ int hci_abort_conn_sync(struct hci_dev *hdev, struct hci_conn *conn, u8 reason) static int hci_disconnect_all_sync(struct hci_dev *hdev, u8 reason) { - struct hci_conn *conn, *tmp; - int err; + struct list_head *head = &hdev->conn_hash.list; - list_for_each_entry_safe(conn, tmp, &hdev->conn_hash.list, list) { - err = hci_abort_conn_sync(hdev, conn, reason); - if (err) - return err; + /* Use reverse order so links are cleanup before parents */ + while (!list_empty(&hdev->conn_hash.list)) { + struct hci_conn *conn = list_last_entry(head, struct hci_conn, + list); + + /* Disregard possible errors since hci_conn_del shall have been + * called even in case of errors had occurred since it would + * then cause hci_conn_failed to be called which calls + * hci_conn_del internally. + */ + hci_abort_conn_sync(hdev, conn, reason); } return 0;