From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B4BBC433EA for ; Mon, 27 Jul 2020 14:13:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2BCD62083E for ; Mon, 27 Jul 2020 14:13:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595859202; bh=1qUn0lMJORu6ifgNr/+2XMmc4BJdRSnGJM6VzusjKEw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=W8hnORBHnMnoMjiHFxWHglTaqmmO4l/WBolSfnaugVzooy76YyyaS2hki53DSCEvv V4Gx7RxvfCJzxroGAoTx0pyEy7/Tuj+kDwK1M+vb/OIN/mmYKXl/o2DCI9G2iaKIkL hFXze0qP++oqeD7HGC2suwYQGfJIm5T+Unh6irv0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729752AbgG0ONU (ORCPT ); Mon, 27 Jul 2020 10:13:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:38236 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729741AbgG0ONT (ORCPT ); Mon, 27 Jul 2020 10:13:19 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BCF4D208E4; Mon, 27 Jul 2020 14:13:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595859199; bh=1qUn0lMJORu6ifgNr/+2XMmc4BJdRSnGJM6VzusjKEw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YmFCUXMOrIzAFKjyW5t11wIBW77yMl7r1xK1mmKaHUOL/WQBpLcGLZS1yjc84I/4l SLWC/hbCgBZiFcYDbpTnDwAbrSEEu615Pql9zpoZwmnalvS/xLfZgFJF6Pb9/3jvDn 7hjsmRpgT37/bm20pX/eqciMkIrJuSy9JueUTGc4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Gavin Shan , Sudeep Holla , Will Deacon , Sasha Levin Subject: [PATCH 5.4 017/138] drivers/firmware/psci: Fix memory leakage in alloc_init_cpu_groups() Date: Mon, 27 Jul 2020 16:03:32 +0200 Message-Id: <20200727134926.176944604@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200727134925.228313570@linuxfoundation.org> References: <20200727134925.228313570@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Gavin Shan [ Upstream commit c377e67c6271954969384f9be1b1b71de13eba30 ] The CPU mask (@tmp) should be released on failing to allocate @cpu_groups or any of its elements. Otherwise, it leads to memory leakage because the CPU mask variable is dynamically allocated when CONFIG_CPUMASK_OFFSTACK is enabled. Signed-off-by: Gavin Shan Reviewed-by: Sudeep Holla Link: https://lore.kernel.org/r/20200630075227.199624-1-gshan@redhat.com Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- drivers/firmware/psci/psci_checker.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/psci/psci_checker.c b/drivers/firmware/psci/psci_checker.c index 6a445397771ca..03eb798ad3ed9 100644 --- a/drivers/firmware/psci/psci_checker.c +++ b/drivers/firmware/psci/psci_checker.c @@ -157,8 +157,10 @@ static int alloc_init_cpu_groups(cpumask_var_t **pcpu_groups) cpu_groups = kcalloc(nb_available_cpus, sizeof(cpu_groups), GFP_KERNEL); - if (!cpu_groups) + if (!cpu_groups) { + free_cpumask_var(tmp); return -ENOMEM; + } cpumask_copy(tmp, cpu_online_mask); @@ -167,6 +169,7 @@ static int alloc_init_cpu_groups(cpumask_var_t **pcpu_groups) topology_core_cpumask(cpumask_any(tmp)); if (!alloc_cpumask_var(&cpu_groups[num_groups], GFP_KERNEL)) { + free_cpumask_var(tmp); free_cpu_groups(num_groups, &cpu_groups); return -ENOMEM; } -- 2.25.1