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 CCEB7C433EF for ; Mon, 21 Feb 2022 09:59:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354511AbiBUJ6f (ORCPT ); Mon, 21 Feb 2022 04:58:35 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:41696 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352216AbiBUJrO (ORCPT ); Mon, 21 Feb 2022 04:47:14 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 438BE4133D; Mon, 21 Feb 2022 01:19:11 -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 sin.source.kernel.org (Postfix) with ESMTPS id AC800CE0E76; Mon, 21 Feb 2022 09:19:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 96E40C340E9; Mon, 21 Feb 2022 09:19:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1645435148; bh=T/9a8ZFqzI04rIa9qySyU7dRfHWzV44EAOAJRgZ3a+U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EzQN1BsqeHL2gLGt2fZCu1vrGlTjgbz/28eIQm5Si2cIatsk2bI9Qec3tZAogUFsE PvZtXUBUZFItJe5CW3Jhh8Hsdx2SmY3yvd+uiOXo79kM94Wv0sTPfwf21D81qVy+w1 18uenlXxj06HtwvotIZQb5RKRzn7bkSj0SkSq4qs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chris Leech , Sagi Grimberg , Sasha Levin Subject: [PATCH 5.16 061/227] nvme-tcp: fix possible use-after-free in transport error_recovery work Date: Mon, 21 Feb 2022 09:48:00 +0100 Message-Id: <20220221084936.905930014@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220221084934.836145070@linuxfoundation.org> References: <20220221084934.836145070@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 22046415a0942..891a36d02e7c7 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -2104,6 +2104,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