From patchwork Wed Jun 21 06:38:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miaohe Lin X-Patchwork-Id: 110816 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp4165413vqr; Tue, 20 Jun 2023 23:50:49 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5mbdvlhgVt0Bmw5mxnH453zGyBsEw8QyNAKtEFK7WICHAl5he8tKHLi1sGSGdhOHrsgvX2 X-Received: by 2002:a05:6808:16a6:b0:39e:c615:949f with SMTP id bb38-20020a05680816a600b0039ec615949fmr12524032oib.24.1687330249046; Tue, 20 Jun 2023 23:50:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687330249; cv=none; d=google.com; s=arc-20160816; b=IU3UtYOZV+2qvNa/Oo4Jfrcaxll1sGRy8QU7hg6gFJ59acEI42jjf6clFMdkxwBdW2 7CuWJxORDiO8EWCBpPSzpoC2og8gYoL/n7WYCt5IUYXEZWcMuQa9S5CjDIZoa5uc5ff3 puPKsJEmTNMt6okvRtMHPhesn0yZ7O3N14lKAsjflT7Xy8oX5P4XQUgLJYlAHzI6p07l x8unKvOzeOWogN+D28ySqnb7KCH6RjowS8viXG9EZL/ysVimqbu1jvEG58zsGZgrVJL9 Go964h7M91kEddy9KcLRdR+xg8ebWGIpSoaiQqcvx4dNzimdTS1s9XZT575Gr8hiq4gI 9RCw== 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 :message-id:date:subject:cc:to:from; bh=qoFMaNi4UpieRTrSY/LPcCbiVISLwsL8yKU1Jxbn5sw=; b=AO/QQEgLy+ILgWYY2BaXfaxNK9R786o9Zo93GQCkZMm7YGrXwRaga669eciPZatQtR Y/qt6ptI64I75sv0n2W119sA4kdtAZ5xyecGvBPH2KoliqbMJWCFxI81gpbtnai/zYyB Oh8WqksZ7woj+8Vx5QUVib46XEcRdbIZ89UwDHspFPIn2yRWuyZTyh2+fKoQOTe/E3Jt /Zsm1TFnVaDsq2z/k0KUcD15UQ449oaRfW9miWBw6n0qmstT/m1whfqbQFeDaPJsUwWP EE+BVxn0X3CrEV3rxIE+UlSVM/LgLe+YiZPwmHODutN067p8jJw64Z1hWJspkRhztGEZ 7D5w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c191-20020a6335c8000000b005537a94f14dsi3131129pga.844.2023.06.20.23.50.33; Tue, 20 Jun 2023 23:50:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229954AbjFUGjc (ORCPT + 99 others); Wed, 21 Jun 2023 02:39:32 -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 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 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769294002960074878?= X-GMAIL-MSGID: =?utf-8?q?1769294002960074878?= 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 support") 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) #define NR_DISTANCE_VALUES (1 << DISTANCE_BITS) +static void sched_free_numa_mask(struct cpumask ***masks, int nr_levels) +{ + int i, j; + + for (i = 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 = 0; i < nr_levels; i++) { masks[i] = kzalloc(nr_node_ids * sizeof(void *), GFP_KERNEL); - if (!masks[i]) + if (!masks[i]) { + sched_free_numa_mask(masks, nr_levels); return; + } for_each_cpu_node_but(j, offline_node) { struct cpumask *mask = kzalloc(cpumask_size(), GFP_KERNEL); int k; - if (!mask) + if (!mask) { + sched_free_numa_mask(masks, nr_levels); return; + } masks[i][j] = mask;