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.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 E6D36C4345E for ; Tue, 14 Jul 2020 14:43:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BBF7C206F5 for ; Tue, 14 Jul 2020 14:43:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594737803; bh=1qUn0lMJORu6ifgNr/+2XMmc4BJdRSnGJM6VzusjKEw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sT3x7cRIVXWRhWhDvR395BLLlJzwr53FIXCxz1Fz+z9hXnbIGtQPGHicXpPmo3qyD tdABsKGRDCOMMHnc87nvpH4B7HmbOyoDdRVvMmKyUxslM/bylrzSjKzwPyDCqW0jQq lE0oo4FGkeBEv535m3kFZv8s1ULo/BfjTt3sz/xE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729042AbgGNOjk (ORCPT ); Tue, 14 Jul 2020 10:39:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:55032 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726517AbgGNOjh (ORCPT ); Tue, 14 Jul 2020 10:39:37 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2208B2256E; Tue, 14 Jul 2020 14:39:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594737576; bh=1qUn0lMJORu6ifgNr/+2XMmc4BJdRSnGJM6VzusjKEw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FgQF0sgqBpXybVglQmAeU1ZtS1MljjGoBKWO6PjylQxUIl3lxL5B5C4Jbe4eCCKKt cUKcB4csJ8r6xKRpQD0BNf3N8iMskU+1dj8XqOoLZf6vi3RTwnthZGERmzpAb2mSnJ lN0R421VGGPh37AiQR9gGfLFc7UAcfAaqL1YHSK4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Gavin Shan , Sudeep Holla , Will Deacon , Sasha Levin , linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.4 18/18] drivers/firmware/psci: Fix memory leakage in alloc_init_cpu_groups() Date: Tue, 14 Jul 2020 10:39:14 -0400 Message-Id: <20200714143914.4035489-18-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200714143914.4035489-1-sashal@kernel.org> References: <20200714143914.4035489-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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