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 BCDEF157A4F; Tue, 23 Jul 2024 18:29: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=1721759341; cv=none; b=FokdFIUZXsNBk/WEkVYrPmuxrqlT4PqSTUGVaQkTG0RRLr4Z6nezmsG4iRP3P6jpgCBtHBN7AWoUyIrIFAcQZ7cWNTS0q+tWBKN+lHIQ461VEcu/f7EGN9XMWHJNNFiYALCGxwpDDift8xOxY/ytzuYcUXQl8EBmofsiHY2EfRs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721759341; c=relaxed/simple; bh=m91AIoPLJwPS5Vx8/6ZGqwuhbSQjNQ/z2IbARfLmS28=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KIrt19jZIsq+bVaoH9LkPbUtTYqYqP7LjzEQvYl5jmqAPirNdWBYxR5yuikcVB38TYpndQfUjPR0SuiU1/wSsOeBfcRR5oYugYuBKJp5FoGPFXJTpgmgGg3XRCyoLc9JwgjZEUDOlczUW+jl5hd8gs1XFPWY/cPiKZMWAEPbNzg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=blM8waX6; 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="blM8waX6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EEC88C4AF09; Tue, 23 Jul 2024 18:29:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1721759341; bh=m91AIoPLJwPS5Vx8/6ZGqwuhbSQjNQ/z2IbARfLmS28=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=blM8waX6lLhHugunODNJNGUa9aQfwZodINoFLb/hO2Tv+cnNS/eFauetL7ZzV7QJQ vhA4fPvLL3vnI5ZM5Thijyb03YbxVnKpkS5eByTHveJte40HwrGeRq9ar2ic2+dX1V 2by7ZG+lFrFhmoK6VWcql895wwQ99mw+091dupNc= 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.1 083/105] Bluetooth: hci_core: cancel all works upon hci_unregister_dev() Date: Tue, 23 Jul 2024 20:24:00 +0200 Message-ID: <20240723180406.443145835@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240723180402.490567226@linuxfoundation.org> References: <20240723180402.490567226@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-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 d6be3cb86598e..3b1b0fbd1240a 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -2727,7 +2727,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