From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 66A2313D896; Tue, 23 Jul 2024 18:43:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721760181; cv=none; b=h2G+UQ0/S6auorsmJtM9P26erUHJEqy4G1Zj8TVAszh+NZs/ClxiBD5Xje7qSrDTOfy8aPSg51BNsUC03pB+sNcaS+3eKXpfejwy2MpNEFzTU/eKu7xEap2MS6VVvFibB9eBNg6E93w8f3Ihg7pMINuf3Jcwmu6LlxZv60bFthA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721760181; c=relaxed/simple; bh=y9a8BDzH9Iv5+VPIHNZMoBuujOUFsIDVc4yclA0gsiU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RX5KI2mshF7V4qeFyTj9jZc497GeliN2fNJwcYenEQdM2IzPvch6sP1953W+SwLeo+LTkgMceqv5WT57jGguoYE+9IQiRzvvdF83+Y893naGafbQ2//Z+h04P0biu8BSxqGLN0cegT4GGYmlDlNrjbuVAQ4tymCYL2hDiRA0Mvo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Rj9Z/F6z; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Rj9Z/F6z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E1616C4AF0A; Tue, 23 Jul 2024 18:43:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1721760181; bh=y9a8BDzH9Iv5+VPIHNZMoBuujOUFsIDVc4yclA0gsiU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rj9Z/F6zyQOlD9g8QIqLpY4lZcHDAaNVqR48EKKK6YnC0wY1cfYHEcgcU0Gi42MZB 6dFDRjZovAa6PGuoRfsGUJzNT5ypW3ukJA0rQKDPJxZFAkepGnMCSKhZqXJ+um5hTW gDeWNajeBRQrcaSEj0WZw+KB5fWdy5fE+BHv0rAA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot , Tetsuo Handa , Luiz Augusto von Dentz , Sasha Levin Subject: [PATCH 6.9 129/163] Bluetooth: hci_core: cancel all works upon hci_unregister_dev() Date: Tue, 23 Jul 2024 20:24:18 +0200 Message-ID: <20240723180148.457273655@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240723180143.461739294@linuxfoundation.org> References: <20240723180143.461739294@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Tetsuo Handa [ Upstream commit 0d151a103775dd9645c78c97f77d6e2a5298d913 ] syzbot is reporting that calling hci_release_dev() from hci_error_reset() due to hci_dev_put() from hci_error_reset() can cause deadlock at destroy_workqueue(), for hci_error_reset() is called from hdev->req_workqueue which destroy_workqueue() needs to flush. We need to make sure that hdev->{rx_work,cmd_work,tx_work} which are queued into hdev->workqueue and hdev->{power_on,error_reset} which are queued into hdev->req_workqueue are no longer running by the moment destroy_workqueue(hdev->workqueue); destroy_workqueue(hdev->req_workqueue); are called from hci_release_dev(). Call cancel_work_sync() on these work items from hci_unregister_dev() as soon as hdev->list is removed from hci_dev_list. Reported-by: syzbot Closes: https://syzkaller.appspot.com/bug?extid=da0a9c9721e36db712e8 Signed-off-by: Tetsuo Handa Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Sasha Levin --- net/bluetooth/hci_core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 24f6b6a5c7721..131bb8b5777b4 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -2744,7 +2744,11 @@ void hci_unregister_dev(struct hci_dev *hdev) list_del(&hdev->list); write_unlock(&hci_dev_list_lock); + cancel_work_sync(&hdev->rx_work); + cancel_work_sync(&hdev->cmd_work); + cancel_work_sync(&hdev->tx_work); cancel_work_sync(&hdev->power_on); + cancel_work_sync(&hdev->error_reset); hci_cmd_sync_clear(hdev); -- 2.43.0