From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9BBB41F19D; Tue, 16 Jan 2024 00:14:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="rQXzdvRa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1DD78C433C7; Tue, 16 Jan 2024 00:14:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705364045; bh=5xaBwxTKxIz5PyR/JD4JH843H06XHTnJjJPrj74bQP4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rQXzdvRa0N/xQGkE4Rrh4HuFL/4nCVTo1b4CQGR/dQyj4RLgfBwqJTbJXdQd7gu6X XkH8acud20Xgi4fy/7paGXLLS/tsMbvwdaJlVcNZqzH1gEIgcu8sYFuVoPu+xa+wFN CpFWVPryh2Vp1S3Fekn4ES/QgJKeiwVg8BCh2s3Xd9X6BLTmJSTwQUtnIOYkMmAHzb 7Hl8N01lPps2TZIvpHKiyEA4UUMz6p1Yqb5khBchQtQhzvqxvWMtD/G/c8Y138KGrt CHOyPcfo4AQFpwmv+TRqYFZGCLu+xqVKxhOj9prPONyU+oBB8FkSmBgKMWjLsPz6Ek OsB2Rv9E3LVvw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yuntao Wang , "Rafael J . Wysocki" , Sasha Levin , rafael@kernel.org, alison.schofield@intel.com, dan.j.williams@intel.com, dave.hansen@linux.intel.com, linux-acpi@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 10/14] ACPI: NUMA: Fix the logic of getting the fake_pxm value Date: Mon, 15 Jan 2024 19:13:36 -0500 Message-ID: <20240116001347.213328-10-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240116001347.213328-1-sashal@kernel.org> References: <20240116001347.213328-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.12 Content-Transfer-Encoding: 8bit From: Yuntao Wang [ Upstream commit e3f577830ce216b0ca21d4750cbbd64cfc21efff ] The for loop does not iterate over the last element of the node_to_pxm_map array. This could lead to a conflict between the final fake_pxm value and the existing pxm values. That is, the final fake_pxm value can not be guaranteed to be an unused pxm value. While at it, fix up white space in slit_valid(). Signed-off-by: Yuntao Wang [ rjw: Changelog edits ] Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/acpi/numa/srat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/numa/srat.c b/drivers/acpi/numa/srat.c index 12f330b0eac0..b57de78fbf14 100644 --- a/drivers/acpi/numa/srat.c +++ b/drivers/acpi/numa/srat.c @@ -183,7 +183,7 @@ static int __init slit_valid(struct acpi_table_slit *slit) int i, j; int d = slit->locality_count; for (i = 0; i < d; i++) { - for (j = 0; j < d; j++) { + for (j = 0; j < d; j++) { u8 val = slit->entry[d*i + j]; if (i == j) { if (val != LOCAL_DISTANCE) @@ -532,7 +532,7 @@ int __init acpi_numa_init(void) */ /* fake_pxm is the next unused PXM value after SRAT parsing */ - for (i = 0, fake_pxm = -1; i < MAX_NUMNODES - 1; i++) { + for (i = 0, fake_pxm = -1; i < MAX_NUMNODES; i++) { if (node_to_pxm_map[i] > fake_pxm) fake_pxm = node_to_pxm_map[i]; } -- 2.43.0