From patchwork Mon Feb 21 08:48:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 544944 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 7A559C4332F for ; Mon, 21 Feb 2022 09:07:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347410AbiBUJHV (ORCPT ); Mon, 21 Feb 2022 04:07:21 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:40106 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347415AbiBUJGZ (ORCPT ); Mon, 21 Feb 2022 04:06:25 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 047BA31202; Mon, 21 Feb 2022 00:59:46 -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 85D42B80E72; Mon, 21 Feb 2022 08:59:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C1849C340E9; Mon, 21 Feb 2022 08:59:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1645433981; bh=BS9Ko2QC+OxvdoIghWYVdEAnfZ/rzhWb6JF2Wd0BIEg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dKymfAfuoI1CiWfYWr/U6iDCw9ek5Z1zt0GiAvMFdqvVusRyu+iPx6mF5D5tZg99L Eko/aF2y9vL0PPcC25Tvd7dWxmrTYmgYYV08PBnYmsL13XSVagRVN12mw2s5s1DmVO rGxtUedWkSEY5pR1LofaYNefv39NVcYwLfo8s7Oo= 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.4 19/80] nvme-tcp: fix possible use-after-free in transport error_recovery work Date: Mon, 21 Feb 2022 09:48:59 +0100 Message-Id: <20220221084916.216170560@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220221084915.554151737@linuxfoundation.org> References: <20220221084915.554151737@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@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 1eef7ed0c3026..4378344f0e7ab 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -1955,6 +1955,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);