Received: by 2002:a05:6a10:7420:0:0:0:0 with SMTP id hk32csp4041753pxb; Mon, 21 Feb 2022 10:44:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJw+B7lGGABbTAxAsGKXtiJwuwLeAe0Wq0L7sBiFHKLaG4X5jr+7ge4rxxvMZ4n0n+7GJcWX X-Received: by 2002:a05:6402:849:b0:412:8cf5:73db with SMTP id b9-20020a056402084900b004128cf573dbmr22438418edz.237.1645469087625; Mon, 21 Feb 2022 10:44:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645469087; cv=none; d=google.com; s=arc-20160816; b=xys7Khr6pmlN14MEPB91UoxZsuQbGpoqFh26uA7l1ExckDtzp4QLA4VU+sEH4hZeGl n8BwxJN7KHW8LKxRstbWQZYvYxHZ792uanlVGSeJmWskpS51Qe76wnoiLPm0mzwjI6E5 Td4a7Alb0kgcjWqr8jkdT0ifPoGt8Rncg2rsDajGUSSaG1pjdMo+jpFh0rYkRClDMWzG 8DdLmEpVvt1RpD2EGANIR7b4JH+1PdPtPB5NeESYbNp0Rt1padITuo9c6L9bm5DIB7JS grkP9+WbViNVptCJ0NQXGhNtIljs6b2MuxCttJdTvFUnQKtjPZByNCtLHvjsP0eX4Cru uLzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=HEnZD9sSkvC0YS/e/L6jknHwCUih6nMCKaw4MPhLAvw=; b=o5zYqlR+PlknSnbL1VMr/amW9b33J165asI/ZHxRLmmlnNk8tOvIIjG78WmYqhMCjc FrEhlyDVGTMNn71Q/ilhdnSWC/3nHJ/Zg8n8o7Oxaap9doqUXZYzg2OEAWikR51yJIZx q0ADbip07bTYVc6eEVZuBLd1LNVOBwzQoL3me48zEtl1of1QqfqyKgrm4I+qJ1fdowwj qD2KRYswgL/Bl8LTXR2KcFqF5IIB5q/fho+c5H8A9gsuBvgniWduKWy2R+gAxS2myKSd 3Bfy1HCz7JbILQ3SmGfXwdlz+jC+WMaaGL4cKV6TMZQ7nfRakfh59eo+U0xKqZd6k/7l DFGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Rca1V6MZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b3si11108741eds.472.2022.02.21.10.44.25; Mon, 21 Feb 2022 10:44:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Rca1V6MZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346053AbiBUI74 (ORCPT + 99 others); Mon, 21 Feb 2022 03:59:56 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:59280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346895AbiBUI72 (ORCPT ); Mon, 21 Feb 2022 03:59:28 -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 2480326128; Mon, 21 Feb 2022 00:55:08 -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 8E2F36112B; Mon, 21 Feb 2022 08:55:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 748F5C340E9; Mon, 21 Feb 2022 08:55:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1645433707; bh=IbxYndShaUN1LdttA6NiRREW3GWMiaYelf0xxIh24h0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rca1V6MZb7+jWqmQSvHz0QP1u/4BFR1p85IpUl3HSpvKwn7qM1gY8UTM8/uTUpd8c LBaYuhzD7VBUPStZLz3//XBORfnRXPVBjNxPK98TFd8mqrf7B8mZS2Uk22eLR8j9wq YPQgYCCN8Ci+sKmh7OkDYbEwj4pgYtstEBO3jBKs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sagi Grimberg , Sasha Levin Subject: [PATCH 4.19 14/58] nvme: fix a possible use-after-free in controller reset during load Date: Mon, 21 Feb 2022 09:49:07 +0100 Message-Id: <20220221084912.351863300@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220221084911.895146879@linuxfoundation.org> References: <20220221084911.895146879@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sagi Grimberg [ Upstream commit 0fa0f99fc84e41057cbdd2efbfe91c6b2f47dd9d ] Unlike .queue_rq, in .submit_async_event drivers may not check the ctrl readiness for AER submission. This may lead to a use-after-free condition that was observed with nvme-tcp. The race condition may happen in the following scenario: 1. driver executes its reset_ctrl_work 2. -> nvme_stop_ctrl - flushes ctrl async_event_work 3. ctrl sends AEN which is received by the host, which in turn schedules AEN handling 4. teardown admin queue (which releases the queue socket) 5. AEN processed, submits another AER, calling the driver to submit 6. driver attempts to send the cmd ==> use-after-free In order to fix that, add ctrl state check to validate the ctrl is actually able to accept the AER submission. This addresses the above race in controller resets because the driver during teardown should: 1. change ctrl state to RESETTING 2. flush async_event_work (as well as other async work elements) So after 1,2, any other AER command will find the ctrl state to be RESETTING and bail out without submitting the AER. Signed-off-by: Sagi Grimberg Signed-off-by: Sasha Levin --- drivers/nvme/host/core.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index e64310f2296f8..a0a805a5ab6b2 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -3463,7 +3463,14 @@ static void nvme_async_event_work(struct work_struct *work) container_of(work, struct nvme_ctrl, async_event_work); nvme_aen_uevent(ctrl); - ctrl->ops->submit_async_event(ctrl); + + /* + * The transport drivers must guarantee AER submission here is safe by + * flushing ctrl async_event_work after changing the controller state + * from LIVE and before freeing the admin queue. + */ + if (ctrl->state == NVME_CTRL_LIVE) + ctrl->ops->submit_async_event(ctrl); } static bool nvme_ctrl_pp_status(struct nvme_ctrl *ctrl) -- 2.34.1