lkml.org 
[lkml]   [2021]   [Sep]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.14 091/252] workqueue: Fix possible memory leaks in wq_numa_init()
    Date
    From: Zhen Lei <thunder.leizhen@huawei.com>

    [ Upstream commit f728c4a9e8405caae69d4bc1232c54ff57b5d20f ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    kernel/workqueue.c | 12 +++++++-----
    1 file changed, 7 insertions(+), 5 deletions(-)

    diff --git a/kernel/workqueue.c b/kernel/workqueue.c
    index f148eacda55a..542c2d03dab6 100644
    --- a/kernel/workqueue.c
    +++ b/kernel/workqueue.c
    @@ -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]);
    }

    --
    2.30.2
    \
     
     \ /
      Last update: 2021-09-09 13:48    [W:3.123 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site