linux-kernel - [PATCH] NUMA x86: add constraints check for nid parameters in numa.c functions

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Tue,  8 Nov 2011 14:28:42 +0100
From:	Petr Holasek <pholasek@...hat.com>
To:	linux-kernel@...r.kernel.org
Cc:	anton@...hat.com, Petr Holasek <pholasek@...hat.com>,
	Thomas Gleixner <tglx@...utronix.de> (maintainer:X86
	ARCHITECTURE...),
	Ingo Molnar <mingo@...hat.com> (maintainer:X86 ARCHITECTURE... 
	,commit_signer:7/19=37%),
	"H. Peter Anvin" <hpa@...or.com> (maintainer:X86 ARCHITECTURE...),
	x86@...nel.org (maintainer:X86 ARCHITECTURE...),
	Tejun Heo <tj@...nel.org> (commit_signer:15/19=79%),
	Pekka Enberg <penberg@...nel.org> (commit_signer:3/19=16%),
	David Rientjes <rientjes@...gle.com> (commit_signer:2/19=11%),
	Yinghai Lu <yinghai@...nel.org> (commit_signer:2/19=11%)
Subject: [PATCH] NUMA x86: add constraints check for nid parameters in numa.c functions

This patch adds constraints checks into __node_distance() and
numa_set_distance() functions. If from or to parameters are
lower than zero, it results into oops now.

Signed-off-by: Petr Holasek <pholasek@...hat.com>
---
 arch/x86/mm/numa.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index fbeaaf4..0f98356 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -439,6 +439,12 @@ void __init numa_set_distance(int from, int to, int distance)
 	if (!numa_distance && numa_alloc_distance() < 0)
 		return;
 
+	if (from < 0 || to < 0) {
+		pr_warn_once("NUMA: Warning: invalid from/to nid parameter, from=%d to=%d distance=%d\n",
+				from, to, distance);
+		return;
+	}
+
 	if (from >= numa_distance_cnt || to >= numa_distance_cnt) {
 		printk_once(KERN_DEBUG "NUMA: Debug: distance out of bound, from=%d to=%d distance=%d\n",
 			    from, to, distance);
@@ -457,7 +463,7 @@ void __init numa_set_distance(int from, int to, int distance)
 
 int __node_distance(int from, int to)
 {
-	if (from >= numa_distance_cnt || to >= numa_distance_cnt)
+	if (from < 0 || to < 0 || from >= numa_distance_cnt || to >= numa_distance_cnt)
 		return from == to ? LOCAL_DISTANCE : REMOTE_DISTANCE;
 	return numa_distance[from * numa_distance_cnt + to];
 }
-- 
1.7.6.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/