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 B94C2C433F5 for ; Wed, 9 Feb 2022 18:48:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240645AbiBISsJ (ORCPT ); Wed, 9 Feb 2022 13:48:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241287AbiBISqi (ORCPT ); Wed, 9 Feb 2022 13:46:38 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F25BC05CB9F; Wed, 9 Feb 2022 10:43:54 -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 BF719612AC; Wed, 9 Feb 2022 18:43:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 71EC8C36AE7; Wed, 9 Feb 2022 18:43:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1644432232; bh=xbseft0bFThlkg8lFzuN/SR2wFUAQLzKHqgJRlH3A6E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NSDlhu1t++mtj/XceTUQNH+QiB/y3Gzi+GEn5EUN4Dw5fBgsK/Kg/sZibp2Nwx65p pgqxLLQ7eMK1WxZ+8OCifKMeG0C58z91YimUDJDLB3macLtJ60Xn4lVJE/qyQbDORB SHYqc+GsQGpcfs5v2s2AK64WNMNZCe2OZyhLocNq5V+op/Bah9/zoUe+qlDifOtdiG xFjdILo2XOC+MG1bzxnxU7NQtLqeeFSb1BkwCv6pHEe2w7lBZf4wlGXS+rRyWm1afi eCAenIXV3go9VKY+4ivSB5q4UzzROpM3NZXmoDPjASz58n7Iyx4r3wN7PKuFC+mFuX TLX+zDu5uwgyA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sagi Grimberg , Sasha Levin , kbusch@kernel.org, axboe@fb.com, linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 5.4 13/15] nvme-rdma: fix possible use-after-free in transport error_recovery work Date: Wed, 9 Feb 2022 13:42:59 -0500 Message-Id: <20220209184305.47983-13-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220209184305.47983-1-sashal@kernel.org> References: <20220209184305.47983-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 b6bb1722f34bbdbabed27acdceaf585d300c5fd2 ] While nvme_rdma_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. Signed-off-by: Sagi Grimberg Signed-off-by: Sasha Levin --- drivers/nvme/host/rdma.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index 08a23bb4b8b57..4213c71b02a4b 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -1110,6 +1110,7 @@ static void nvme_rdma_error_recovery_work(struct work_struct *work) struct nvme_rdma_ctrl, err_work); nvme_stop_keep_alive(&ctrl->ctrl); + flush_work(&ctrl->ctrl.async_event_work); nvme_rdma_teardown_io_queues(ctrl, false); nvme_start_queues(&ctrl->ctrl); nvme_rdma_teardown_admin_queue(ctrl, false); -- 2.34.1