From nobody Mon Feb 9 01:26:55 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 73DD7EB64D8 for ; Wed, 21 Jun 2023 06:39:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230407AbjFUGjd (ORCPT ); Wed, 21 Jun 2023 02:39:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230404AbjFUGi6 (ORCPT ); Wed, 21 Jun 2023 02:38:58 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C8AA1998 for ; Tue, 20 Jun 2023 23:38:55 -0700 (PDT) Received: from canpemm500002.china.huawei.com (unknown [172.30.72.55]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4QmDNk6JR0z1FDgk; Wed, 21 Jun 2023 14:38:46 +0800 (CST) Received: from huawei.com (10.175.104.170) by canpemm500002.china.huawei.com (7.192.104.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Wed, 21 Jun 2023 14:38:53 +0800 From: Miaohe Lin To: , , , CC: , , , , , , , Subject: [PATCH] sched/topology: fix potential memoryleak in sched_init_numa() Date: Wed, 21 Jun 2023 14:38:17 +0800 Message-ID: <20230621063817.3753617-1-linmiaohe@huawei.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.175.104.170] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To canpemm500002.china.huawei.com (7.192.104.244) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" When sched_init_numa() fails to allocate enough memory for sched domains numa masks, it forgot to free the allocated memory leading to memoryleak. Add a helper to help release the resource. Fixes: cb83b629bae0 ("sched/numa: Rewrite the CONFIG_NUMA sched domain supp= ort") Signed-off-by: Miaohe Lin --- kernel/sched/topology.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c index 290509383419..dcec4d653ae3 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -1807,6 +1807,20 @@ static void init_numa_topology_type(int offline_node) =20 #define NR_DISTANCE_VALUES (1 << DISTANCE_BITS) =20 +static void sched_free_numa_mask(struct cpumask ***masks, int nr_levels) +{ + int i, j; + + for (i =3D 0; i < nr_levels; i++) { + if (!masks[i]) + continue; + for_each_node(j) + kfree(masks[i][j]); + kfree(masks[i]); + } + kfree(masks); +} + void sched_init_numa(int offline_node) { struct sched_domain_topology_level *tl; @@ -1886,15 +1900,19 @@ void sched_init_numa(int offline_node) */ for (i =3D 0; i < nr_levels; i++) { masks[i] =3D kzalloc(nr_node_ids * sizeof(void *), GFP_KERNEL); - if (!masks[i]) + if (!masks[i]) { + sched_free_numa_mask(masks, nr_levels); return; + } =20 for_each_cpu_node_but(j, offline_node) { struct cpumask *mask =3D kzalloc(cpumask_size(), GFP_KERNEL); int k; =20 - if (!mask) + if (!mask) { + sched_free_numa_mask(masks, nr_levels); return; + } =20 masks[i][j] =3D mask; =20 --=20 2.27.0