Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Received-SPF: Pass (protection.outlook.com: domain of opensynergy.com
 designates 217.66.60.4 as permitted sender) receiver=protection.outlook.com;
 client-ip=217.66.60.4; helo=SR-MAIL-03.open-synergy.com;
From:   Vasyl Vavrychuk <vasyl.vavrychuk@opensynergy.com>
To:     linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
        linux-bluetooth@vger.kernel.org
Cc:     Marcel Holtmann <marcel@holtmann.org>,
        Johan Hedberg <johan.hedberg@gmail.com>,
        Luiz Augusto von Dentz <luiz.dentz@gmail.com>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Vasyl Vavrychuk <vasyl.vavrychuk@opensynergy.com>
Subject: [PATCH] Bluetooth: core: Fix missing power_on work cancel on HCI close
Date:   Tue, 26 Apr 2022 11:18:23 +0300
Message-Id: <20220426081823.21557-1-vasyl.vavrychuk@opensynergy.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Apr 2022 08:18:47.9178
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 501170bf-5ec7-43e7-45a0-08da275d636e
X-MS-Exchange-CrossTenant-Id: 800fae25-9b1b-4edc-993d-c939c4e84a64
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=800fae25-9b1b-4edc-993d-c939c4e84a64;Ip=[217.66.60.4];Helo=[SR-MAIL-03.open-synergy.com]
X-MS-Exchange-CrossTenant-AuthSource: VI1EUR05FT018.eop-eur05.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4810
X-TM-AS-ERS: 104.47.6.53-0.0.0.0
X-TMASE-Version: StarCloud-1.3-8.8.1001-26856.005
X-TMASE-Result: 10--8.517500-4.000000
X-TMASE-MatchedRID: 87nu31iyiq0nUo7A2pUbcVVeGWZmxN2MiK5qg1cmsr/pDcNppAyF7y1s
        QGcqD7UtOLejJ6ccXRy9XH1WKh6kzcFnRyUPbswoOGTV4fFD6yCUq+GQ/zyJdNzONa1Rspx36Ch
        K9oqyX+Qi+t+0AiFaYvL3NxFKQpq19IaoJGJ/0IvR7uN8GOEHx2vaomg0i4KNNP1+Jpfbz7PbvL
        AHy5vsJOgc6mX1lwNHkRoxEQkO3VF1H8bw68oiD67rlQMPRoOCxEHRux+uk8jHUU+U0ACZwBU9o
        pSlzGWXgYVRxD442q71A99fjzIMpRmAwVUvIOlynqg/VrSZEiM=
X-TMASE-XGENCLOUD: 6f6d8b2e-5f7b-94ae-bd38-46078b2ad1fc-0-0-200-0
X-TM-Deliver-Signature: 8D88C8CFD38102D18328CE92B9635BE8
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=opensynergy.com;
        s=TM-DKIM-20210503141657; t=1650961201;
        bh=6Luu7RUoPayupfIaY3ek/X2ofFiL4Tlr868h2CngHuo=; l=1389;
        h=From:To:Date;
        b=R1px1OR7jwykPfyyiROy+SRztnSV+EEIwyQw024P5MMiHuLttlCHLYk/fHTSfbwfz
         H6fEf3RkE6hRtvarGhZDQEftCv3PyndyOcku2IxGWihsLyT/fMoI9SOHcI7fqTWfGT
         t0x09wpC/xqd9i3dyGIKh00M38eL9SU89wlHkYag1ll6sdBN4JR8RlJechKe/iQs4N
         d0g6Ftke/aic7TC7pg3mOqnwj4yEt2aRpJJ0bdkRRCOkxOioa+OauHQ3TCKifgoMQY
         O4IKYSpWPCsaJ8Rqh87efTWjGr3XUZcMnthsahwrSd3qQh75tiiVQ13m+FHR9voiSg
         aeabMrsIFQh8A==
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS,
        SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-bluetooth.vger.kernel.org>
X-Mailing-List: linux-bluetooth@vger.kernel.org

Move power_on work cancel to hci_dev_close_sync to ensure that power_on
work is canceled after HCI interface down, power off, rfkill, etc.

For example, if

    hciconfig hci0 down

is done early enough during boot, it may run before power_on work.
Then, power_on work will actually bring up interface despite above
hciconfig command.

Signed-off-by: Vasyl Vavrychuk <vasyl.vavrychuk@opensynergy.com>
---
 net/bluetooth/hci_core.c | 2 --
 net/bluetooth/hci_sync.c | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index b4782a6c1025..ad4f4ab0afca 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -2675,8 +2675,6 @@ void hci_unregister_dev(struct hci_dev *hdev)
 	list_del(&hdev->list);
 	write_unlock(&hci_dev_list_lock);
 
-	cancel_work_sync(&hdev->power_on);
-
 	hci_cmd_sync_clear(hdev);
 
 	if (!test_bit(HCI_QUIRK_NO_SUSPEND_NOTIFIER, &hdev->quirks))
diff --git a/net/bluetooth/hci_sync.c b/net/bluetooth/hci_sync.c
index 8f4c5698913d..c5b0dbfc0379 100644
--- a/net/bluetooth/hci_sync.c
+++ b/net/bluetooth/hci_sync.c
@@ -4058,6 +4058,7 @@ int hci_dev_close_sync(struct hci_dev *hdev)
 
 	bt_dev_dbg(hdev, "");
 
+	cancel_work_sync(&hdev->power_on);
 	cancel_delayed_work(&hdev->power_off);
 	cancel_delayed_work(&hdev->ncmd_timer);
 
-- 
2.30.2