From mboxrd@z Thu Jan 1 00:00:00 1970 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 E18B4C6FA82 for ; Mon, 26 Sep 2022 23:31:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229881AbiIZXbO (ORCPT ); Mon, 26 Sep 2022 19:31:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229832AbiIZXbJ (ORCPT ); Mon, 26 Sep 2022 19:31:09 -0400 Received: from mail-pj1-x104a.google.com (mail-pj1-x104a.google.com [IPv6:2607:f8b0:4864:20::104a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55519193FA for ; Mon, 26 Sep 2022 16:31:08 -0700 (PDT) Received: by mail-pj1-x104a.google.com with SMTP id a6-20020a17090abe0600b00200303ba903so8472226pjs.2 for ; Mon, 26 Sep 2022 16:31:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date; bh=MEx5AkRis1Q8EBfRmtqZKYRH8hsFfpfHGF2r7Wrj8Wg=; b=oy5u290Oq4tGTcZN/o5eOVGn93Dr3gj2v9kjK1/60a123+BFF/pOshej4ed+7lLCyK 87FebeWk7csjvy3AyP94AKC+3SyzVmFT+dfOG2MES3sG+CtUsxboA0eCZb5tABBBEo4x HmBaD27w3gXzGs+nuO4aRtCVMcsF2zXnpLMRWMX4QH6Sf/g1lpfLbFQo58WbvapYNJO3 rhaiad+kcvB/uvNrzDREfmauO3IyRk+A5idHXu8Ic5z9p+1bnWyCFRGc0/MiwcnOl3hm SG0AddHzOTmtjcfKBfDqhUsbxDvp7MdpuS0ia0J/7CwJnG7eoXTHr0RHzjrCsL0MhPxu k9qQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date; bh=MEx5AkRis1Q8EBfRmtqZKYRH8hsFfpfHGF2r7Wrj8Wg=; b=XmK2DgZSTUqTMlxEXDqAVTeqmOSfDKAORR0751IxGyYmHASbwxaetV6NiFicgMP+rH oVzRiuDQVgpyQsEFnthk8OnyYy2vUMwhGPxTmnjrwQnceBXpPzEaKwYOuR/wAlYcFAQw TN/h3cSW+eiCCGF7PPmB9w1F5BzIEjJNdPhXg7OB4gBC6PAd1iO2do3ZuCUFpxecWp89 ljTn/UJmLUCbvQCCr4lNJy2FFuB7IZwT0zzaoXQtwnzx2UGeGESVPvsDUkmwpvXiJoHR 1rv8IPtQG9qGiW2YL+qQpYqTzLxF11CVR8jucCNCBeolRBit2iDEEkfiZs3xcIFDVWlE Yehg== X-Gm-Message-State: ACrzQf3kxQgHIzRC6Vttb+fUjPAIr8HHlBAeobCh1NmBS8KZFNnBTf7K LrAxOEf8Vc9/syKP9Bi/9lU+JUyfYrs19BpNU+GS8Q== X-Google-Smtp-Source: AMsMyM4rbGVokC9aE2JE/xVF0x1ZAaDQoXdTOe8TJxSSOUZU+I06PvqFSGV0xiKIvEhz/HDR3L37U5Dhs5unsxWHE67adw== X-Received: from abps.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:9b4]) (user=abhishekpandit job=sendgmr) by 2002:a05:6a00:1493:b0:546:2856:6d08 with SMTP id v19-20020a056a00149300b0054628566d08mr26226712pfu.84.1664235067789; Mon, 26 Sep 2022 16:31:07 -0700 (PDT) Date: Mon, 26 Sep 2022 16:31:03 -0700 Mime-Version: 1.0 X-Mailer: git-send-email 2.37.3.998.g577e59143f-goog Message-ID: <20220926163057.1.Ia168b651a69b253059f2bbaa60b98083e619545c@changeid> Subject: [PATCH] Bluetooth: Prevent double register of suspend From: Abhishek Pandit-Subedi To: linux-bluetooth@vger.kernel.org Cc: Abhishek Pandit-Subedi , syzbot , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Johan Hedberg , Luiz Augusto von Dentz , Marcel Holtmann , Paolo Abeni , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Abhishek Pandit-Subedi Suspend notifier should only be registered and unregistered once per hdev. Since hci_sock and hci_register_dev run in different work queues (sock vs driver), add hci_dev_lock to avoid double registering. Reported-by: syzbot Signed-off-by: Abhishek Pandit-Subedi --- This is fixing a syzbot reported warning. Tested in the following ways: * Normal start-up of driver with bluez. * Start/stop loop using HCI_USER_CHANNEL (sock path). * USB reset triggering hci_dev_unregister (driver path). ------------[ cut here ]------------ double register detected WARNING: CPU: 0 PID: 2657 at kernel/notifier.c:27 notifier_chain_register kernel/notifier.c:27 [inline] WARNING: CPU: 0 PID: 2657 at kernel/notifier.c:27 notifier_chain_register+0x5c/0x124 kernel/notifier.c:22 Modules linked in: CPU: 0 PID: 2657 Comm: syz-executor212 Not tainted 5.10.136-syzkaller-19376-g6f46a5fe0124 #0 8f0771607702f5ef7184d2ee33bd0acd70219fc4 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 07/22/2022 RIP: 0010:notifier_chain_register kernel/notifier.c:27 [inline] RIP: 0010:notifier_chain_register+0x5c/0x124 kernel/notifier.c:22 Code: 6a 41 00 4c 8b 23 4d 85 e4 0f 84 88 00 00 00 e8 c2 1e 19 00 49 39 ec 75 18 e8 b8 1e 19 00 48 c7 c7 80 6d ca 84 e8 2c 68 48 03 <0f> 0b e9 af 00 00 00 e8 a0 1e 19 00 48 8d 7d 10 48 89 f8 48 c1 e8 RSP: 0018:ffffc900009d7da8 EFLAGS: 00010286 RAX: 0000000000000000 RBX: ffff8881076fd1d8 RCX: 0000000000000000 RDX: 0000001810895100 RSI: ffff888110895100 RDI: fffff5200013afa7 RBP: ffff88811a4191d0 R08: ffffffff813b8ca1 R09: 0000000080000000 R10: 0000000000000000 R11: 0000000000000005 R12: ffff88811a4191d0 R13: dffffc0000000000 R14: 0000000000000000 R15: 0000000000000000 FS: 00005555571f5300(0000) GS:ffff8881f6c00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000078e3857f3075 CR3: 000000010d668000 CR4: 00000000003506f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: blocking_notifier_chain_register+0x8c/0xa6 kernel/notifier.c:254 hci_register_suspend_notifier net/bluetooth/hci_core.c:2733 [inline] hci_register_suspend_notifier+0x6b/0x7c net/bluetooth/hci_core.c:2727 hci_sock_release+0x270/0x3cf net/bluetooth/hci_sock.c:889 __sock_release+0xcd/0x1de net/socket.c:597 sock_close+0x18/0x1c net/socket.c:1267 __fput+0x418/0x729 fs/file_table.c:281 task_work_run+0x12b/0x15b kernel/task_work.c:151 tracehook_notify_resume include/linux/tracehook.h:188 [inline] exit_to_user_mode_loop kernel/entry/common.c:165 [inline] exit_to_user_mode_prepare+0x8f/0x130 kernel/entry/common.c:192 syscall_exit_to_user_mode+0x172/0x1b2 kernel/entry/common.c:268 entry_SYSCALL_64_after_hwframe+0x61/0xc6 RIP: 0033:0x78e38575e1db Code: 0f 05 48 3d 00 f0 ff ff 77 45 c3 0f 1f 40 00 48 83 ec 18 89 7c 24 0c e8 63 fc ff ff 8b 7c 24 0c 41 89 c0 b8 03 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 35 44 89 c7 89 44 24 0c e8 a1 fc ff ff 8b 44 RSP: 002b:00007ffffc20a0b0 EFLAGS: 00000293 ORIG_RAX: 0000000000000003 RAX: 0000000000000000 RBX: 0000000000000006 RCX: 000078e38575e1db RDX: ffffffffffffffb8 RSI: 0000000020000000 RDI: 0000000000000005 RBP: 0000000000000000 R08: 0000000000000000 R09: 0000000000000150 R10: 0000000000000000 R11: 0000000000000293 R12: 000000000000e155 R13: 00007ffffc20a140 R14: 00007ffffc20a130 R15: 00007ffffc20a0e8 include/net/bluetooth/hci.h | 1 + net/bluetooth/hci_core.c | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index e004ba04a9ae..36304c217151 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -353,6 +353,7 @@ enum { HCI_OFFLOAD_CODECS_ENABLED, HCI_LE_SIMULTANEOUS_ROLES, HCI_CMD_DRAIN_WORKQUEUE, + HCI_SUSPEND_REGISTERED, HCI_MESH_EXPERIMENTAL, HCI_MESH, diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 66c7cdba0d32..5a32d17c69b8 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -2760,10 +2760,18 @@ int hci_register_suspend_notifier(struct hci_dev *hdev) { int ret = 0; - if (!test_bit(HCI_QUIRK_NO_SUSPEND_NOTIFIER, &hdev->quirks)) { + hci_dev_lock(hdev); + if (!test_bit(HCI_QUIRK_NO_SUSPEND_NOTIFIER, &hdev->quirks) && + !hci_dev_test_and_set_flag(hdev, HCI_SUSPEND_REGISTERED)) { + memset(&hdev->suspend_notifier, 0, + sizeof(hdev->suspend_notifier)); hdev->suspend_notifier.notifier_call = hci_suspend_notifier; ret = register_pm_notifier(&hdev->suspend_notifier); + + if (ret) + hci_dev_clear_flag(hdev, HCI_SUSPEND_REGISTERED); } + hci_dev_unlock(hdev); return ret; } @@ -2772,8 +2780,12 @@ int hci_unregister_suspend_notifier(struct hci_dev *hdev) { int ret = 0; - if (!test_bit(HCI_QUIRK_NO_SUSPEND_NOTIFIER, &hdev->quirks)) + hci_dev_lock(hdev); + if (!test_bit(HCI_QUIRK_NO_SUSPEND_NOTIFIER, &hdev->quirks) && + hci_dev_test_and_clear_flag(hdev, HCI_SUSPEND_REGISTERED)) { ret = unregister_pm_notifier(&hdev->suspend_notifier); + } + hci_dev_unlock(hdev); return ret; } -- 2.37.3.998.g577e59143f-goog