[v3] drivers/firmware/psci: Fix memory leakage in alloc_init_cpu_groups()

Commit Message

Gavin Shan June 30, 2020, 7:52 a.m. UTC

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 <[e-mail]>
Reviewed-by: Sudeep Holla <[e-mail]>
---
v3: Pick r-b from Sudeep and rebases to 5.8.rc3
---
 drivers/firmware/psci/psci_checker.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Will Deacon July 8, 2020, 10:02 p.m. UTC | #1

On Tue, 30 Jun 2020 17:52:27 +1000, Gavin Shan wrote:
> 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.

Applied to arm64 (for-next/fixes), thanks!

[1/1] drivers/firmware/psci: Fix memory leakage in alloc_init_cpu_groups()
      https://git.kernel.org/arm64/c/c377e67c6271

Cheers,

Patch

diff --git a/drivers/firmware/psci/psci_checker.c b/drivers/firmware/psci/psci_checker.c
index 873841af8d57..d9b1a2d71223 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;
 		}