Commit f728c4a9 authored by Zhen Lei's avatar Zhen Lei Committed by Tejun Heo
Browse files

workqueue: Fix possible memory leaks in wq_numa_init() 



In error handling branch "if (WARN_ON(node == NUMA_NO_NODE))", the
previously allocated memories are not released. Doing this before
allocating memory eliminates memory leaks.

tj: Note that the condition only occurs when the arch code is pretty broken
and the WARN_ON might as well be BUG_ON().

Signed-off-by: default avatarZhen Lei <thunder.leizhen@huawei.com>
Reviewed-by: default avatarLai Jiangshan <jiangshanlai@gmail.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 7e96bf47

kernel/workqueue.c

+7 −5
Original line number Diff line number Diff line
@@ -5902,6 +5902,13 @@ static void __init wq_numa_init(void) 
		return;

	}



	for_each_possible_cpu(cpu) {

		if (WARN_ON(cpu_to_node(cpu) == NUMA_NO_NODE)) {

			pr_warn("workqueue: NUMA node mapping not available for cpu%d, disabling NUMA support\n", cpu);

			return;

		}

	}



	wq_update_unbound_numa_attrs_buf = alloc_workqueue_attrs();

	BUG_ON(!wq_update_unbound_numa_attrs_buf);
@@ -5919,11 +5926,6 @@ static void __init wq_numa_init(void) 


	for_each_possible_cpu(cpu) {

		node = cpu_to_node(cpu);

		if (WARN_ON(node == NUMA_NO_NODE)) {

			pr_warn("workqueue: NUMA node mapping not available for cpu%d, disabling NUMA support\n", cpu);

			/* happens iff arch is bonkers, let's just proceed */

			return;

		}

		cpumask_set_cpu(cpu, tbl[node]);

	}