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 82CB7C4167D for ; Wed, 9 Feb 2022 18:41:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235898AbiBISlr (ORCPT ); Wed, 9 Feb 2022 13:41:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54708 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240084AbiBISka (ORCPT ); Wed, 9 Feb 2022 13:40:30 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA386C050CFB; Wed, 9 Feb 2022 10:39:55 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 50AC2B82378; Wed, 9 Feb 2022 18:39:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3249AC340E7; Wed, 9 Feb 2022 18:39:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1644431993; bh=zIx1hJ3twxcRwji/KiyxGcWVwTCRfzELab1GBSE3O4c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lsNrizGBE/qhBVqtHmMBfwNK++tB/pcIealzuvfsMwXVK3kSKksZqWb9t4p8QOXXG 6gkZgOHBLPdtg6/7SXO2bWwiWsinu6oRHE+PHc5rIE8v+/a3s6W4LC2vi2MoAP+IdM sRBcBwK1EscfUzCogw3W0szNuff+BA7whEvJz+ygIXROV4FJty/Ww9pEPJ1jX3udFP 6q8OcIXZgl9cU8FSkZ1PaWbWNh3TzaM1bMsN191w6kt6UkwBiG3xLukFTHBViMxWRL 2Wt8wZQlBgtNFc40/a+JotSTJTQ0M2LK4yDkbcIG1bMzGJ62vR1ZTROZu84VWARvtk DmVx3O7ywEghg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sagi Grimberg , Chris Leech , Sasha Levin , kbusch@kernel.org, axboe@fb.com, linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 5.15 27/36] nvme-tcp: fix possible use-after-free in transport error_recovery work Date: Wed, 9 Feb 2022 13:37:50 -0500 Message-Id: <20220209183759.47134-27-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220209183759.47134-1-sashal@kernel.org> References: <20220209183759.47134-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sagi Grimberg [ Upstream commit ff9fc7ebf5c06de1ef72a69f9b1ab40af8b07f9e ] While nvme_tcp_submit_async_event_work is checking the ctrl and queue state before preparing the AER command and scheduling io_work, in order to fully prevent a race where this check is not reliable the error recovery work must flush async_event_work before continuing to destroy the admin queue after setting the ctrl state to RESETTING such that there is no race .submit_async_event and the error recovery handler itself changing the ctrl state. Tested-by: Chris Leech Signed-off-by: Sagi Grimberg Signed-off-by: Sasha Levin --- drivers/nvme/host/tcp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 4ae562d30d2b9..e5f7c7fa76478 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -2097,6 +2097,7 @@ static void nvme_tcp_error_recovery_work(struct work_struct *work) struct nvme_ctrl *ctrl = &tcp_ctrl->ctrl; nvme_stop_keep_alive(ctrl); + flush_work(&ctrl->async_event_work); nvme_tcp_teardown_io_queues(ctrl, false); /* unquiesce to fail fast pending requests */ nvme_start_queues(ctrl); -- 2.34.1