From mboxrd@z Thu Jan 1 00:00:00 1970 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 247A8C433FE for ; Sat, 19 Nov 2022 09:02:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232327AbiKSJCi (ORCPT ); Sat, 19 Nov 2022 04:02:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231351AbiKSJCd (ORCPT ); Sat, 19 Nov 2022 04:02:33 -0500 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 509509DBA7 for ; Sat, 19 Nov 2022 01:02:32 -0800 (PST) Received: from dggpeml500023.china.huawei.com (unknown [172.30.72.55]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4NDndf6QTTzFqQX; Sat, 19 Nov 2022 16:59:18 +0800 (CST) Received: from ubuntu1804.huawei.com (10.67.174.58) by dggpeml500023.china.huawei.com (7.185.36.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Sat, 19 Nov 2022 17:02:30 +0800 From: Xiu Jianfeng To: , , , , , , , CC: , , Subject: [PATCH 1/2] x86/xen: Fix memory leak in xen_smp_intr_init{_pv}() Date: Sat, 19 Nov 2022 16:59:22 +0800 Message-ID: <20221119085923.114889-2-xiujianfeng@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221119085923.114889-1-xiujianfeng@huawei.com> References: <20221119085923.114889-1-xiujianfeng@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.67.174.58] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpeml500023.china.huawei.com (7.185.36.114) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org These local variables @{resched|pmu|callfunc...}_name saves the new string allocated by kasprintf(), and when bind_{v}ipi_to_irqhandler() fails, it goes to the @fail tag, and calls xen_smp_intr_free{_pv}() to free resource, however the new string is not saved, which cause a memory leak issue. fix it. Fixes: 9702785a747a ("i386: move xen") Signed-off-by: Xiu Jianfeng --- arch/x86/xen/smp.c | 16 ++++++++++++---- arch/x86/xen/smp_pv.c | 8 ++++++-- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index c3e1f9a7d43a..6e9426b6b18a 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c @@ -71,8 +71,10 @@ int xen_smp_intr_init(unsigned int cpu) IRQF_PERCPU|IRQF_NOBALANCING, resched_name, NULL); - if (rc < 0) + if (rc < 0) { + kfree(resched_name); goto fail; + } per_cpu(xen_resched_irq, cpu).irq = rc; per_cpu(xen_resched_irq, cpu).name = resched_name; @@ -83,8 +85,10 @@ int xen_smp_intr_init(unsigned int cpu) IRQF_PERCPU|IRQF_NOBALANCING, callfunc_name, NULL); - if (rc < 0) + if (rc < 0) { + kfree(callfunc_name); goto fail; + } per_cpu(xen_callfunc_irq, cpu).irq = rc; per_cpu(xen_callfunc_irq, cpu).name = callfunc_name; @@ -94,8 +98,10 @@ int xen_smp_intr_init(unsigned int cpu) xen_debug_interrupt, IRQF_PERCPU | IRQF_NOBALANCING, debug_name, NULL); - if (rc < 0) + if (rc < 0) { + kfree(debug_name); goto fail; + } per_cpu(xen_debug_irq, cpu).irq = rc; per_cpu(xen_debug_irq, cpu).name = debug_name; } @@ -107,8 +113,10 @@ int xen_smp_intr_init(unsigned int cpu) IRQF_PERCPU|IRQF_NOBALANCING, callfunc_name, NULL); - if (rc < 0) + if (rc < 0) { + kfree(callfunc_name); goto fail; + } per_cpu(xen_callfuncsingle_irq, cpu).irq = rc; per_cpu(xen_callfuncsingle_irq, cpu).name = callfunc_name; diff --git a/arch/x86/xen/smp_pv.c b/arch/x86/xen/smp_pv.c index 480be82e9b7b..228d0207380c 100644 --- a/arch/x86/xen/smp_pv.c +++ b/arch/x86/xen/smp_pv.c @@ -124,8 +124,10 @@ int xen_smp_intr_init_pv(unsigned int cpu) IRQF_PERCPU|IRQF_NOBALANCING, callfunc_name, NULL); - if (rc < 0) + if (rc < 0) { + kfree(callfunc_name); goto fail; + } per_cpu(xen_irq_work, cpu).irq = rc; per_cpu(xen_irq_work, cpu).name = callfunc_name; @@ -135,8 +137,10 @@ int xen_smp_intr_init_pv(unsigned int cpu) xen_pmu_irq_handler, IRQF_PERCPU|IRQF_NOBALANCING, pmu_name, NULL); - if (rc < 0) + if (rc < 0) { + kfree(pmu_name); goto fail; + } per_cpu(xen_pmu_irq, cpu).irq = rc; per_cpu(xen_pmu_irq, cpu).name = pmu_name; } -- 2.17.1