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: Zhen Lei <thunder.leizhen@huawei.com> Reviewed-by: Lai Jiangshan <jiangshanlai@gmail.com> Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Родитель
7e96bf4762
Коммит
f728c4a9e8
|
@ -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]);
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче