From patchwork Thu Sep 16 15:58:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 512982 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp1361170jao; Thu, 16 Sep 2021 09:15:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxR/fwMwGIPc1qNCwD25hx5xH09/oavqDY5tXwmqyqPbp+C9dZzr8AMXHua7ZlEkvaIcqwG X-Received: by 2002:adf:9dc6:: with SMTP id q6mr6863939wre.161.1631808905446; Thu, 16 Sep 2021 09:15:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631808905; cv=none; d=google.com; s=arc-20160816; b=NLp5owa41Fw2X8D58BRzWCxhrpoIcSu1sD3l1JZacRNoQkD9kWkePIDfFIo1GsEorN L0nlMmOu4J89Ov4qFpcGNVADZAN/pb+0LChD2T6FvcVE7DG45AadHCQDPtLC5ZcxgvzS ev67CuitVA4kE1aKVunQMCGJ+C4qnvbSgh4jdMkeOVx6E7VTUcXH38kF/OkZY9YJH/6Z b2CMebb2cPzBsv/PF3+mH4dSAaaPee5/i0xFqKAsRfE2JIA3KayNeLu4e95nAXVxxEUL wwSm7zie7VOK/XeM/S6gFIgMKIVFs4fgm2wfkbwZWetwAmjeANqOH2Krj5iGAzYgy9Fg AfTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=zCCHiOS8DYCUxpnfgnYEzM2l2ilyy4pLTiMdvKLGKrk=; b=hVd9gbWZjmMUb+O2dDvVAs7QFzqXEtHjUf+cKuTvpRRONkBVlv45sJOO6a59A/r1aQ RYRSn6z2kcnsJ1Mvp/9GoJUE0fO1rTTWUg+KOmVAdjK8mQJfsvYfC476RXrPlHTa15Ks QOVIyoMFJhOtT2D/32E/DgMqTEdirVDdwV4LTw4QC1QX+tJ2rKP/ftmRtpScf2jz82tG fM27FOqaAKz2CGZLYcM1zWomLgRZh5xTg0uWznS02LH2SuIf9zFuaPnfuncpQZniK5Fj MNhsehjCyW4+jHOHLsL5GoM19YplsQQ+aPSwu4OgLb5ahE4m1h62i53Ja+gmB7jp71jA i5sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="W/fIMZ3W"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g15si4051625eds.75.2021.09.16.09.15.05; Thu, 16 Sep 2021 09:15:05 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="W/fIMZ3W"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237369AbhIPQQX (ORCPT + 11 others); Thu, 16 Sep 2021 12:16:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:55110 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240915AbhIPQOi (ORCPT ); Thu, 16 Sep 2021 12:14:38 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4C67261268; Thu, 16 Sep 2021 16:10:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631808650; bh=ci/6sM5g9q+0mICJ5w1Xmts/Td0E5Z17TOwST3Pq3bo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W/fIMZ3Wd7z8uQwsskJzq9FIj3iDpHHk1nXtUUevvBl3iVKclSjb87h6NLZvsuNad RGAddZgZw/VwuEkflXnyQxUBdVeEBbOE7+zR4oucQwOgdkm6nunCTO7S4UZHBiDDZv +3VflxwseomEB+QNYw8DXgdxqTJCh4VpGlpMgihM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zhen Lei , Lai Jiangshan , Tejun Heo , Sasha Levin Subject: [PATCH 5.10 170/306] workqueue: Fix possible memory leaks in wq_numa_init() Date: Thu, 16 Sep 2021 17:58:35 +0200 Message-Id: <20210916155759.884954121@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916155753.903069397@linuxfoundation.org> References: <20210916155753.903069397@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zhen Lei [ 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 Reviewed-by: Lai Jiangshan Signed-off-by: Tejun Heo Signed-off-by: Sasha Levin --- kernel/workqueue.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) -- 2.30.2 diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 51d19fc71e61..4cb622b2661b 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -5893,6 +5893,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); @@ -5910,11 +5917,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]); }