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 B9C9AC4167B for ; Mon, 11 Dec 2023 13:58:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343995AbjLKN6b (ORCPT ); Mon, 11 Dec 2023 08:58:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344015AbjLKN6E (ORCPT ); Mon, 11 Dec 2023 08:58:04 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A9BF30E0 for ; Mon, 11 Dec 2023 05:56:08 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B2E11C433CD; Mon, 11 Dec 2023 13:56:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702302968; bh=lMJEhmVYmuu4out2fSgULXaIPPuW8p8UkyV9jmmX7ts=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ib4/hXy1pQu/F8ZMTj/G/AY2A/lKqCLz+VLCC1nrrvOXANFdJAt8jWUleO5pNYMfR uz4jcCMFZZLAEGPkxNF11GpwZLw0AXqBCfYIYKve4eYDkdRdSe3Wv7QcBASgQY4457 th9DQFrUPDJiF4LVyUg4eXkJoUw/dLVANjNhtV80v5qDa9gWJknlE4DVCqGMPuIyCE t/j99W+pticQmMysG8lTf+OPBgzYQE4Fg6Cp+r4iLnJvIirE7OHBg8NU8oRNC539Ta RqKkCxQ93+tUDzFZlQvdCzYWUPW5aj69/kYajqx05X3RIlCotRMY7wC4zsHvZd4kvl 8QvpuzQmdA0ug== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Nitesh Shetty , Christoph Hellwig , Sagi Grimberg , Keith Busch , Sasha Levin , kch@nvidia.com, linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 6.1 20/29] nvme: prevent potential spectre v1 gadget Date: Mon, 11 Dec 2023 08:54:04 -0500 Message-ID: <20231211135457.381397-20-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231211135457.381397-1-sashal@kernel.org> References: <20231211135457.381397-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.66 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nitesh Shetty [ Upstream commit 20dc66f2d76b4a410df14e4675e373b718babc34 ] This patch fixes the smatch warning, "nvmet_ns_ana_grpid_store() warn: potential spectre issue 'nvmet_ana_group_enabled' [w] (local cap)" Prevent the contents of kernel memory from being leaked to user space via speculative execution by using array_index_nospec. Signed-off-by: Nitesh Shetty Reviewed-by: Christoph Hellwig Reviewed-by: Sagi Grimberg Signed-off-by: Keith Busch Signed-off-by: Sasha Levin --- drivers/nvme/target/configfs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/nvme/target/configfs.c b/drivers/nvme/target/configfs.c index 6a2816f3b4e80..73ae16059a1cb 100644 --- a/drivers/nvme/target/configfs.c +++ b/drivers/nvme/target/configfs.c @@ -16,6 +16,7 @@ #endif #include #include +#include #include "nvmet.h" @@ -508,6 +509,7 @@ static ssize_t nvmet_ns_ana_grpid_store(struct config_item *item, down_write(&nvmet_ana_sem); oldgrpid = ns->anagrpid; + newgrpid = array_index_nospec(newgrpid, NVMET_MAX_ANAGRPS); nvmet_ana_group_enabled[newgrpid]++; ns->anagrpid = newgrpid; nvmet_ana_group_enabled[oldgrpid]--; @@ -1580,6 +1582,7 @@ static struct config_group *nvmet_ana_groups_make_group( grp->grpid = grpid; down_write(&nvmet_ana_sem); + grpid = array_index_nospec(grpid, NVMET_MAX_ANAGRPS); nvmet_ana_group_enabled[grpid]++; up_write(&nvmet_ana_sem); -- 2.42.0