diff options
| author | Phil Carmody <ext-phil.2.carmody@nokia.com> | 2009-12-10 14:29:37 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-12-10 14:28:10 +0100 |
| commit | dfc12eb26a285df316be68a808af86964f3bff86 (patch) | |
| tree | 502e31f805cd335131a52dd202c7c2825cf4006b /kernel | |
| parent | 4ca3ef71f54655af98b66e8ff308a47a2a580a53 (diff) | |
| download | linux-stable-dfc12eb26a285df316be68a808af86964f3bff86.tar.gz linux-stable-dfc12eb26a285df316be68a808af86964f3bff86.tar.bz2 linux-stable-dfc12eb26a285df316be68a808af86964f3bff86.zip | |
sched: Fix memory leak in two error corner cases
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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 3de3deab8095..36cc05a76947 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -9855,13 +9855,15 @@ int alloc_fair_sched_group(struct task_group *tg, struct task_group *parent) se = kzalloc_node(sizeof(struct sched_entity), GFP_KERNEL, cpu_to_node(i)); if (!se) - goto err; + goto err_free_rq; init_tg_cfs_entry(tg, cfs_rq, se, i, 0, parent->se[i]); } return 1; + err_free_rq: + kfree(cfs_rq); err: 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), GFP_KERNEL, cpu_to_node(i)); if (!rt_se) - goto err; + goto err_free_rq; init_tg_rt_entry(tg, rt_rq, rt_se, i, 0, parent->rt_se[i]); } return 1; + err_free_rq: + kfree(rt_rq); err: return 0; } |