Messages in this thread Patch in this message |  | | | Date | Mon, 24 Mar 2008 19:31:29 -0700 | | From | Mike Travis <> | | Subject | [PATCH 09/12] sched: fix memory leak in build_sched_domains |
| |
I'm not 100% sure if this is needed but I can't find where memory allocated for sched_group_nodes is released if the kmalloc for alloc_rootdomain fails. Also, sched_group_nodes_bycpu[] is set, but never completely filled in for the kmalloc failure case.
Based on linux-2.6.25-rc5-mm1
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Mike Travis <travis@sgi.com> --- kernel/sched.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) --- linux-2.6.25-rc5.orig/kernel/sched.c +++ linux-2.6.25-rc5/kernel/sched.c @@ -6646,15 +6646,21 @@ static int build_sched_domains(const cpu printk(KERN_WARNING "Can not alloc sched group node list\n"); return -ENOMEM; } - sched_group_nodes_bycpu[first_cpu(*cpu_map)] = sched_group_nodes; #endif rd = alloc_rootdomain(); if (!rd) { printk(KERN_WARNING "Cannot alloc root domain\n"); +#ifdef CONFIG_NUMA + kfree(sched_group_nodes); +#endif return -ENOMEM; } +#ifdef CONFIG_NUMA + sched_group_nodes_bycpu[first_cpu(*cpu_map)] = sched_group_nodes; +#endif + /* * Set up domains for cpus specified by the cpu_map. */ --
|  |