diff options
author | Petr Holasek <pholasek@redhat.com> | 2011-12-08 07:16:41 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-12-09 02:03:34 -0500 |
commit | 54eed6cb16ec315565aaaf8e34252ca253a68b7b (patch) | |
tree | 281cc87a1fd838255b02e39887e49596d8a1fa58 /arch | |
parent | 54c29c635ae91f5d75ced7bffeaa77ba37ca02bb (diff) |
x86/numa: Add constraints check for nid parameters
This patch adds constraint checks to the numa_set_distance()
function.
When the check triggers (this should not happen normally) it
emits a warning and avoids a store to a negative index in
numa_distance[] array - i.e. avoids memory corruption.
Negative ids can be passed when the pxm-to-nids mapping is not
properly filled while parsing the SRAT.
Signed-off-by: Petr Holasek <pholasek@redhat.com>
Acked-by: David Rientjes <rientjes@google.com>
Cc: Anton Arapov <anton@redhat.com>
Link: http://lkml.kernel.org/r/20111208121640.GA2229@dhcp-27-244.brq.redhat.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/mm/numa.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index fbeaaf416610..cdc00543d375 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c | |||
@@ -430,8 +430,9 @@ static int __init numa_alloc_distance(void) | |||
430 | * calls are ignored until the distance table is reset with | 430 | * calls are ignored until the distance table is reset with |
431 | * numa_reset_distance(). | 431 | * numa_reset_distance(). |
432 | * | 432 | * |
433 | * If @from or @to is higher than the highest known node at the time of | 433 | * If @from or @to is higher than the highest known node or lower than zero |
434 | * table creation or @distance doesn't make sense, the call is ignored. | 434 | * at the time of table creation or @distance doesn't make sense, the call |
435 | * is ignored. | ||
435 | * This is to allow simplification of specific NUMA config implementations. | 436 | * This is to allow simplification of specific NUMA config implementations. |
436 | */ | 437 | */ |
437 | void __init numa_set_distance(int from, int to, int distance) | 438 | void __init numa_set_distance(int from, int to, int distance) |
@@ -439,8 +440,9 @@ void __init numa_set_distance(int from, int to, int distance) | |||
439 | if (!numa_distance && numa_alloc_distance() < 0) | 440 | if (!numa_distance && numa_alloc_distance() < 0) |
440 | return; | 441 | return; |
441 | 442 | ||
442 | if (from >= numa_distance_cnt || to >= numa_distance_cnt) { | 443 | if (from >= numa_distance_cnt || to >= numa_distance_cnt || |
443 | printk_once(KERN_DEBUG "NUMA: Debug: distance out of bound, from=%d to=%d distance=%d\n", | 444 | from < 0 || to < 0) { |
445 | pr_warn_once("NUMA: Warning: node ids are out of bound, from=%d to=%d distance=%d\n", | ||
444 | from, to, distance); | 446 | from, to, distance); |
445 | return; | 447 | return; |
446 | } | 448 | } |