[tip:sched/urgent] sched: Fix potential NULL derference of doms_cur
From: tip-bot for Yong Zhang
Date: Sun Sep 20 2009 - 14:30:03 EST
Commit-ID: cb5fd13f1178dee4302646b2890d884c380160e1
Gitweb: http://git.kernel.org/tip/cb5fd13f1178dee4302646b2890d884c380160e1
Author: Yong Zhang <yong.zhang0@xxxxxxxxx>
AuthorDate: Mon, 14 Sep 2009 20:20:16 +0800
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Sun, 20 Sep 2009 20:20:30 +0200
sched: Fix potential NULL derference of doms_cur
If CONFIG_CPUMASK_OFFSTACK is enabled but doms_cur alloc failed in
arch_init_sched_domains(), doms_cur will move back to
fallback_doms. But this time, fallback_doms has not been
initialized yet.
Signed-off-by: Yong Zhang <yong.zhang0@xxxxxxxxx>
Cc: a.p.zijlstra@xxxxxxxxx
LKML-Reference: <1252930816-7672-1-git-send-email-yong.zhang0@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
kernel/sched.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kernel/sched.c b/kernel/sched.c
index 575fb01..1b900fb 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -9165,6 +9165,7 @@ void __init sched_init_smp(void)
cpumask_var_t non_isolated_cpus;
alloc_cpumask_var(&non_isolated_cpus, GFP_KERNEL);
+ alloc_cpumask_var(&fallback_doms, GFP_KERNEL);
#if defined(CONFIG_NUMA)
sched_group_nodes_bycpu = kzalloc(nr_cpu_ids * sizeof(void **),
@@ -9196,7 +9197,6 @@ void __init sched_init_smp(void)
sched_init_granularity();
free_cpumask_var(non_isolated_cpus);
- alloc_cpumask_var(&fallback_doms, GFP_KERNEL);
init_sched_rt_class();
}
#else
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/