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 2258CC433FE for ; Wed, 9 Feb 2022 18:37:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239834AbiBIShG (ORCPT ); Wed, 9 Feb 2022 13:37:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239760AbiBISgy (ORCPT ); Wed, 9 Feb 2022 13:36:54 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB371C05CBB1; Wed, 9 Feb 2022 10:36:36 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 5773B61C12; Wed, 9 Feb 2022 18:36:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E5A47C340ED; Wed, 9 Feb 2022 18:36:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1644431795; bh=yOgw4Yd4WYCoi0YooHiYuwWDyvVW9wrXs/NRDkELzzY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gq8qHvIAkJT+gd9EPrZXlPFwuBi/AsJndKYQq72hkxwoViymL+SKK4vQMIoa37Gd/ pRb5QkB2MxgFAU8FBolKCz5a+6dBq1WQ+hwf5Xv/OmW8UBoiVNFmAXQ9fAbj50AalJ VifH764mmoXCxt679g2yw9r4Qgtg1cJqStBuCed2Uffyl3L4wS/vhIyesh8peo/PH3 b/tb+rWyeSmugFKiPnW4jBuW98bkA67hSFSv4hRUJrDDCYlDWKvXnR81Vsz0PjWrjt c+ldZ2d3QtHnbVOp3PfiybYZxQc+aLPcLstNHzJlNi5eFoE9Rf8YZibA7YKGi+OTwB axrSGXqyRlWTg== 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.16 33/42] nvme-tcp: fix possible use-after-free in transport error_recovery work Date: Wed, 9 Feb 2022 13:33:05 -0500 Message-Id: <20220209183335.46545-33-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220209183335.46545-1-sashal@kernel.org> References: <20220209183335.46545-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 4ceb28675fdf6..01e24b5703dbc 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -2096,6 +2096,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