public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH RESEND] NUMA x86: add constraints check for nid parameters
@ 2011-12-01 11:45 Petr Holasek
  2011-12-01 21:34 ` Andrew Morton
  0 siblings, 1 reply; 17+ messages in thread
From: Petr Holasek @ 2011-12-01 11:45 UTC (permalink / raw)
  To: Thomas Gleixner
  Cc: Ingo Molnar, H. Peter Anvin, linux-kernel, Andrew Morton,
	Anton Arapov, Petr Holasek

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@redhat.com>
---
 arch/x86/mm/numa.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index fbeaaf4..9e0ff2b 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -430,8 +430,9 @@ static int __init numa_alloc_distance(void)
  * calls are ignored until the distance table is reset with
  * numa_reset_distance().
  *
- * If @from or @to is higher than the highest known node at the time of
- * table creation or @distance doesn't make sense, the call is ignored.
+ * If @from or @to is higher than the highest known node or lower than zero
+ * at the time of table creation or @distance doesn't make sense, the call
+ * is ignored.
  * This is to allow simplification of specific NUMA config implementations.
  */
 void __init numa_set_distance(int from, int to, int distance)
@@ -439,7 +440,8 @@ void __init numa_set_distance(int from, int to, int distance)
 	if (!numa_distance && numa_alloc_distance() < 0)
 		return;
 
-	if (from >= numa_distance_cnt || to >= numa_distance_cnt) {
+	if (from >= numa_distance_cnt || to >= numa_distance_cnt ||
+			from < 0 || to < 0) {
 		printk_once(KERN_DEBUG "NUMA: Debug: distance out of bound, from=%d to=%d distance=%d\n",
 			    from, to, distance);
 		return;
@@ -457,7 +459,8 @@ 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


^ permalink raw reply related	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2011-12-09 20:08 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-01 11:45 [PATCH RESEND] NUMA x86: add constraints check for nid parameters Petr Holasek
2011-12-01 21:34 ` Andrew Morton
2011-12-01 23:14   ` Petr Holasek
2011-12-01 23:28     ` Andrew Morton
2011-12-02 10:55       ` Petr Holasek
2011-12-06 20:45         ` David Rientjes
2011-12-07 19:40           ` Petr Holasek
2011-12-07 19:43           ` [PATCH v2] " Petr Holasek
2011-12-07 21:46             ` David Rientjes
2011-12-08 12:16               ` [PATCH v3] " Petr Holasek
2011-12-08 21:09                 ` David Rientjes
2011-12-09  7:10                   ` Ingo Molnar
2011-12-09 10:44                     ` David Rientjes
2011-12-09 20:08                 ` [tip:x86/mm] x86/numa: Add " tip-bot for Petr Holasek
2011-12-08 18:58             ` [PATCH v2] NUMA x86: add " Andi Kleen
2011-12-08 21:12               ` David Rientjes
2011-12-09  7:11               ` Ingo Molnar

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox