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 799D11AD3FC; Tue, 16 Jul 2024 14:30:07 +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=1721140207; cv=none; b=XwZ/GRbRqbgsIGhhsbXdFEC8Rl1w77tUpfYPVvvo//oWkW5iIcc7cPFj3/Z086dIMd2LjYzTpciDQQsHIiGX9NaEGdods7bsFvCmZj3Pm1Z8VwGY3dVv7wFjsFml8k43xOlVAgMT3jr/4MiGmp2IeetGsJ4eoYsF1F60BtEZiHQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721140207; c=relaxed/simple; bh=LjbHBl9XT8eYnK5YHkHUGmwhL5Jidg3r9ntRdAhG60E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iPFPyG1BMZIkkGmMWw4i4aOJD13Cme6R3m43HmFML8Byw6mO4a55bYyRGCwch+kDTUs6s0a/479cr+J8Y5L19bd5yDpC1Jt/NYy13fQXxWbtBmkvBk/EQpKsD5AnBP8AEwChPPf8SSMgoJrt9GC9IUvOoVhL88SOe5yolPy1y+Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=otIN4zQf; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="otIN4zQf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C06F6C116B1; Tue, 16 Jul 2024 14:30:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1721140207; bh=LjbHBl9XT8eYnK5YHkHUGmwhL5Jidg3r9ntRdAhG60E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=otIN4zQfpCXyj7mJM418i1sZHYz4/harxuAMKsQ0JqkSwvfXIytxko/LBhz4T6WmG 1rVQ2HzrsvGTqjMxO2uqEdXcoBRAB5VnG80+dSfLWqmQswDAi+uoX5zm+QhsVC8a+p 4QBY5K23v3+ST3/Onlt+Mq3c4DgERZbre1d6Tz6ghKzzDpBC71IhNc3TMLEbR/GNoo narowg0rE34knIHlHAnhjBdAtltI18AbI4UDPCAo7Cmk8p3rJm1OGBvmXUAG6uTPke hx5RHXHvDfFEeT4ROE6akQp8iv8xJ3G+THQ2j2jXGhL+G9fQW6T7BPYC6TLvIHhkS2 8/mnCoQNvpWyw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tetsuo Handa , syzbot , Luiz Augusto von Dentz , Sasha Levin , marcel@holtmann.org, johan.hedberg@gmail.com, luiz.dentz@gmail.com, linux-bluetooth@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 5/7] Bluetooth: hci_core: cancel all works upon hci_unregister_dev() Date: Tue, 16 Jul 2024 10:29:45 -0400 Message-ID: <20240716142953.2714154-5-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240716142953.2714154-1-sashal@kernel.org> References: <20240716142953.2714154-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.10.221 Content-Transfer-Encoding: 8bit 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 b9cf5bc9364c1..c8c1cd55c0eb0 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -3839,7 +3839,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); if (!test_bit(HCI_QUIRK_NO_SUSPEND_NOTIFIER, &hdev->quirks)) { hci_suspend_clear_tasks(hdev); -- 2.43.0