Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp142086rwb; Mon, 28 Nov 2022 18:16:38 -0800 (PST) X-Google-Smtp-Source: AA0mqf7rJoty/edoATqYEiOg9E55ASw4KnaJJd61RVRfFXqJ3elILotWgnAIqhp09+94KW9693jB X-Received: by 2002:a62:6d02:0:b0:562:3411:cb3a with SMTP id i2-20020a626d02000000b005623411cb3amr35391131pfc.60.1669688197913; Mon, 28 Nov 2022 18:16:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669688197; cv=none; d=google.com; s=arc-20160816; b=znJueZ8Jk+8V6+XAfiP0q8xZwYRCNpgQqcJeTDI28zoQYgRX5mh3bnTjnv0IiTw85A G6R8X4T3w1Sa6jML1HVKk61Nsx6pQyiCjzQeIuQgRL8DQpE6UdRCnyqlEv3bdaIHTg4Q J6HZ2HN9GIZcyyGIvqYfG7YKvair08mlFwc5TBB8rqZaGYM2KWFhAYjFohO1dpgwJ+LX j0Ez6yvlROB1DLv149ixaEvcrax++/drHXcGtL8Iuc7IXV6Xz2UrxHWp7j8gagaGuUQB JGf4AaKx2QlWm5p/FDMWUfNHOgJuK5KeVzNZXVqgFwdMIDxzwTO/tgQCM76PjbMOZ0fu EdFw== 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=BuhOpujWCc5xrrpL3DX9MLHeGEBH3mGIbfal638GkAc=; b=jHlhD0VKmxCm4vpX4QI12CaCHyVF/CrVZsl0P28dneyH1UA0BcjViRrr9NckrmveEI N973TNf7pyxDdvqeahYvVFTn2D/sBiUAhlj2vjDgutG4jtIc/9NhhTEZy4Qvtp1DLjIJ dbrBVSyQkA6U6imw++QYyTE9JSZFKMQYvpS9IVru8YdZfQ6516PvSQ/C/nGnPU2Ck9jE wr7M8+1m6gi5jvd8EuQe58xCQv01Kr7UIc4Ew6lL3EzfeR214cgDv/Ii0XSGY+DrczRO 9bzuUitMWE1ubm1kJBZk3IKR30RvgB/Ptw0MUnxTZ1oJtOQ9FyXVw+jvcgFfyecVJtbT KYLQ== 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id il6-20020a17090b164600b002193ad201a8si418202pjb.138.2022.11.28.18.16.26; Mon, 28 Nov 2022 18:16:37 -0800 (PST) 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 S234729AbiK2BNc (ORCPT + 83 others); Mon, 28 Nov 2022 20:13:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234898AbiK2BNa (ORCPT ); Mon, 28 Nov 2022 20:13:30 -0500 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 70CCF193FA; Mon, 28 Nov 2022 17:13:28 -0800 (PST) Received: from dggpeml500021.china.huawei.com (unknown [172.30.72.53]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4NLkpm4RkGz15Mxb; Tue, 29 Nov 2022 09:12:48 +0800 (CST) Received: from dggpeml500003.china.huawei.com (7.185.36.200) by dggpeml500021.china.huawei.com (7.185.36.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 29 Nov 2022 09:13:26 +0800 Received: from huawei.com (10.175.103.91) by dggpeml500003.china.huawei.com (7.185.36.200) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 29 Nov 2022 09:13:26 +0800 From: Yu Liao To: , CC: , , , , , Subject: [PATCH] platform/x86: mxm-wmi: fix memleak in mxm_wmi_call_mx[ds|mx]() Date: Tue, 29 Nov 2022 09:11:01 +0800 Message-ID: <20221129011101.2042315-1-liaoyu15@huawei.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.103.91] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpeml500003.china.huawei.com (7.185.36.200) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-3.2 required=5.0 tests=BAYES_00,HK_RANDOM_ENVFROM, HK_RANDOM_FROM,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS 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 The ACPI buffer memory (out.pointer) returned by wmi_evaluate_method() is not freed after the call, so it leads to memory leak. The method results in ACPI buffer is not used, so just pass NULL to wmi_evaluate_method() which fixes the memory leak. Fixes: 99b38b4acc0d ("platform/x86: add MXM WMI driver.") Signed-off-by: Yu Liao --- drivers/platform/x86/mxm-wmi.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/platform/x86/mxm-wmi.c b/drivers/platform/x86/mxm-wmi.c index 9a19fbd2f734..9a457956025a 100644 --- a/drivers/platform/x86/mxm-wmi.c +++ b/drivers/platform/x86/mxm-wmi.c @@ -35,13 +35,11 @@ int mxm_wmi_call_mxds(int adapter) .xarg = 1, }; struct acpi_buffer input = { (acpi_size)sizeof(args), &args }; - struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL }; acpi_status status; printk("calling mux switch %d\n", adapter); - status = wmi_evaluate_method(MXM_WMMX_GUID, 0x0, adapter, &input, - &output); + status = wmi_evaluate_method(MXM_WMMX_GUID, 0x0, adapter, &input, NULL); if (ACPI_FAILURE(status)) return status; @@ -60,13 +58,11 @@ int mxm_wmi_call_mxmx(int adapter) .xarg = 1, }; struct acpi_buffer input = { (acpi_size)sizeof(args), &args }; - struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL }; acpi_status status; printk("calling mux switch %d\n", adapter); - status = wmi_evaluate_method(MXM_WMMX_GUID, 0x0, adapter, &input, - &output); + status = wmi_evaluate_method(MXM_WMMX_GUID, 0x0, adapter, &input, NULL); if (ACPI_FAILURE(status)) return status; -- 2.25.1