[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-ecdd6804b7c9e15fe8fc836ba0233d9912834e8b@git.kernel.org>
Date: Mon, 6 Jul 2015 08:35:58 -0700
From: tip-bot for Anshul Garg <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: torvalds@...ux-foundation.org, mingo@...nel.org,
aksgarg1989@...il.com, tglx@...utronix.de,
linux-kernel@...r.kernel.org, hpa@...or.com, peterz@...radead.org
Subject: [tip:sched/core] sched/rt:
Fix memory leak in alloc_rt_sched_group()
Commit-ID: ecdd6804b7c9e15fe8fc836ba0233d9912834e8b
Gitweb: http://git.kernel.org/tip/ecdd6804b7c9e15fe8fc836ba0233d9912834e8b
Author: Anshul Garg <aksgarg1989@...il.com>
AuthorDate: Wed, 1 Jul 2015 12:29:26 -0700
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Mon, 6 Jul 2015 14:17:14 +0200
sched/rt: Fix memory leak in alloc_rt_sched_group()
Added code to free allocated memory by function
alloc_rt_sched_group() in case the kzalloc() API fails.
Signed-off-by: Anshul Garg <aksgarg1989@...il.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Link: http://lkml.kernel.org/r/1435778966-36415-1-git-send-email-aksgarg1989@gmail.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
kernel/sched/rt.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index 0d193a24..cfa907d 100644
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -193,7 +193,7 @@ int alloc_rt_sched_group(struct task_group *tg, struct task_group *parent)
goto err;
tg->rt_se = kzalloc(sizeof(rt_se) * nr_cpu_ids, GFP_KERNEL);
if (!tg->rt_se)
- goto err;
+ goto err_free_rt_rq;
init_rt_bandwidth(&tg->rt_bandwidth,
ktime_to_ns(def_rt_bandwidth.rt_period), 0);
@@ -202,7 +202,7 @@ int alloc_rt_sched_group(struct task_group *tg, struct task_group *parent)
rt_rq = kzalloc_node(sizeof(struct rt_rq),
GFP_KERNEL, cpu_to_node(i));
if (!rt_rq)
- goto err;
+ goto err_free_rt_se;
rt_se = kzalloc_node(sizeof(struct sched_rt_entity),
GFP_KERNEL, cpu_to_node(i));
@@ -218,6 +218,10 @@ int alloc_rt_sched_group(struct task_group *tg, struct task_group *parent)
err_free_rq:
kfree(rt_rq);
+err_free_rt_se:
+ kfree(tg->rt_se);
+err_free_rt_rq:
+ kfree(tg->rt_rq);
err:
return 0;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists