Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754433AbbGFPgd (ORCPT ); Mon, 6 Jul 2015 11:36:33 -0400 Received: from terminus.zytor.com ([198.137.202.10]:49049 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754340AbbGFPg2 (ORCPT ); Mon, 6 Jul 2015 11:36:28 -0400 Date: Mon, 6 Jul 2015 08:35:58 -0700 From: tip-bot for Anshul Garg Message-ID: Cc: torvalds@linux-foundation.org, mingo@kernel.org, aksgarg1989@gmail.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, hpa@zytor.com, peterz@infradead.org Reply-To: peterz@infradead.org, hpa@zytor.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@kernel.org, aksgarg1989@gmail.com In-Reply-To: <1435778966-36415-1-git-send-email-aksgarg1989@gmail.com> References: <1435778966-36415-1-git-send-email-aksgarg1989@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched/rt: Fix memory leak in alloc_rt_sched_group() Git-Commit-ID: ecdd6804b7c9e15fe8fc836ba0233d9912834e8b X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2178 Lines: 61 Commit-ID: ecdd6804b7c9e15fe8fc836ba0233d9912834e8b Gitweb: http://git.kernel.org/tip/ecdd6804b7c9e15fe8fc836ba0233d9912834e8b Author: Anshul Garg AuthorDate: Wed, 1 Jul 2015 12:29:26 -0700 Committer: Ingo Molnar 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 Signed-off-by: Peter Zijlstra (Intel) Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1435778966-36415-1-git-send-email-aksgarg1989@gmail.com Signed-off-by: Ingo Molnar --- 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/