From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753435AbdA3L5M (ORCPT ); Mon, 30 Jan 2017 06:57:12 -0500 Received: from terminus.zytor.com ([65.50.211.136]:47880 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753217AbdA3L5G (ORCPT ); Mon, 30 Jan 2017 06:57:06 -0500 Date: Mon, 30 Jan 2017 03:56:30 -0800 From: tip-bot for Mathieu Poirier Message-ID: Cc: hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, mathieu.poirier@linaro.org, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, efault@gmx.de, peterz@infradead.org Reply-To: linux-kernel@vger.kernel.org, peterz@infradead.org, efault@gmx.de, tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com, torvalds@linux-foundation.org, mathieu.poirier@linaro.org In-Reply-To: <1485292295-21298-2-git-send-email-mathieu.poirier@linaro.org> References: <1485292295-21298-2-git-send-email-mathieu.poirier@linaro.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched/core: Fix &rd->cpudl memory leak Git-Commit-ID: 4b12db939166042eb78e592bdf94ef113c14e379 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 Commit-ID: 4b12db939166042eb78e592bdf94ef113c14e379 Gitweb: http://git.kernel.org/tip/4b12db939166042eb78e592bdf94ef113c14e379 Author: Mathieu Poirier AuthorDate: Tue, 24 Jan 2017 14:11:35 -0700 Committer: Ingo Molnar CommitDate: Mon, 30 Jan 2017 11:46:37 +0100 sched/core: Fix &rd->cpudl memory leak While in the process of initialising a root domain, if function cpupri_init() fails the memory allocated in cpudl_init() is not reclaimed. Adding a new goto target to cleanup the previous initialistion of the root_domain's dl_bw structure reclaims said memory. Signed-off-by: Mathieu Poirier Signed-off-by: Peter Zijlstra (Intel) Cc: Linus Torvalds Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1485292295-21298-2-git-send-email-mathieu.poirier@linaro.org Signed-off-by: Ingo Molnar --- kernel/sched/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 17d1df6..d01f9d0 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -5979,9 +5979,11 @@ static int init_rootdomain(struct root_domain *rd) goto free_rto_mask; if (cpupri_init(&rd->cpupri) != 0) - goto free_rto_mask; + goto free_cpudl; return 0; +free_cpudl: + cpudl_cleanup(&rd->cpudl); free_rto_mask: free_cpumask_var(rd->rto_mask); free_dlo_mask: