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 1E7CCC4167B for ; Mon, 11 Dec 2023 13:54:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343970AbjLKNym (ORCPT ); Mon, 11 Dec 2023 08:54:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234994AbjLKNyY (ORCPT ); Mon, 11 Dec 2023 08:54:24 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 463EFD5B for ; Mon, 11 Dec 2023 05:53:21 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AE0E4C43391; Mon, 11 Dec 2023 13:53:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1702302800; bh=5PfvYngP914UoFoqeziwA++GC230K70pLi1A6QnVh1I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sT2ytsi//ttMwWtngR8z/TjFe9xYS1XrkT+GTWghX7po/f/uRDIw4lwT2vKohIe1E U8UL5WaKRpGJynj0ekfaYKVvhTl1Dc7e42emHaRD4VVKz+TniKNfhdRTB+/grGLbjf /G/PA4ad8au57FDk/TcMFYgrdnHxoiV9MuBTWJaIYfGnJe841PMS3/GccgZpBk4isw sb9x3o32zLkPjDUVUkcVDtSiZGD1ZT4pBMf9EBP+0ZQ4WlmKNuKJgycm5vlt0+zK+H ahdc29nwoxgqPghlALQIfFSBdVaLbY0oR8ngCDkHzUmLzL3R/lP3Vx08SVpXnJlq8T zN2ccyJvDhJJg== 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.6 33/47] nvme: prevent potential spectre v1 gadget Date: Mon, 11 Dec 2023 08:50:34 -0500 Message-ID: <20231211135147.380223-33-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231211135147.380223-1-sashal@kernel.org> References: <20231211135147.380223-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.5 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 907143870da52..01b2a3d1a5e6c 100644 --- a/drivers/nvme/target/configfs.c +++ b/drivers/nvme/target/configfs.c @@ -17,6 +17,7 @@ #endif #include #include +#include #include "nvmet.h" @@ -509,6 +510,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]--; @@ -1700,6 +1702,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