| Message ID | 20200130215148.191953-1-gshan@redhat.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | c377e67c6271954969384f9be1b1b71de13eba30 |
| Headers | show |
| Series | [v2] drivers/firmware/psci: Fix memory leakage in alloc_init_cpu_groups() | expand |
On Fri, Jan 31, 2020 at 08:51:48AM +1100, Gavin Shan wrote: > The CPU mask (@tmp) should be free'd 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 with CONFIG_CPUMASK_OFFSTACK. > Reviewed-by: Sudeep Holla <sudeep.holla@arm.com> -- Regards, Sudeep
diff --git a/drivers/firmware/psci/psci_checker.c b/drivers/firmware/psci/psci_checker.c index 6a445397771c..03eb798ad3ed 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; }
The CPU mask (@tmp) should be free'd 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 with CONFIG_CPUMASK_OFFSTACK. Signed-off-by: Gavin Shan <gshan@redhat.com> --- v2: Free @tmp on failing to allocate @cpu_groups --- drivers/firmware/psci/psci_checker.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)