korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-12 21:44:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

sched: Fix memory leak in two error corner cases

Browse Source 
If the second in each of these pairs of allocations fails, then the
first one will not be freed in the error route out.

Found by a static code analysis tool.

Signed-off-by: Phil Carmody <ext-phil.2.carmody@nokia.com>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1260448177-28448-1-git-send-email-ext-phil.2.carmody@nokia.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Phil Carmody 2009-12-10 14:29:37 +02:00 committed by Ingo Molnar
parent 4ca3ef71f5
commit dfc12eb26a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/sched.c
View File

@ -9855,13 +9855,15 @@ int alloc_fair_sched_group(struct task_group *tg, struct task_group *parent)
se = kzalloc_node(sizeof(struct sched_entity), se = kzalloc_node(sizeof(struct sched_entity),
GFP_KERNEL, cpu_to_node(i)); GFP_KERNEL, cpu_to_node(i));
if (!se) if (!se)
goto err; goto err_free_rq;
init_tg_cfs_entry(tg, cfs_rq, se, i, 0, parent->se[i]); init_tg_cfs_entry(tg, cfs_rq, se, i, 0, parent->se[i]);
} }
return 1; return 1;
err_free_rq:
kfree(cfs_rq);
err: err:
return 0; return 0;
} }
@ -9943,13 +9945,15 @@ int alloc_rt_sched_group(struct task_group *tg, struct task_group *parent)
rt_se = kzalloc_node(sizeof(struct sched_rt_entity), rt_se = kzalloc_node(sizeof(struct sched_rt_entity),
GFP_KERNEL, cpu_to_node(i)); GFP_KERNEL, cpu_to_node(i));
if (!rt_se) if (!rt_se)
goto err; goto err_free_rq;
init_tg_rt_entry(tg, rt_rq, rt_se, i, 0, parent->rt_se[i]); init_tg_rt_entry(tg, rt_rq, rt_se, i, 0, parent->rt_se[i]);
} }
return 1; return 1;
err_free_rq:
kfree(rt_rq);
err: err:
return 0; return 0;
} }