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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1C02C433EF for ; Tue, 9 Nov 2021 01:03:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8F7AD61A50 for ; Tue, 9 Nov 2021 01:03:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239481AbhKIBGd (ORCPT ); Mon, 8 Nov 2021 20:06:33 -0500 Received: from mail.kernel.org ([198.145.29.99]:60162 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241657AbhKIBEd (ORCPT ); Mon, 8 Nov 2021 20:04:33 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2A0FF619EE; Tue, 9 Nov 2021 01:01:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1636419702; bh=Ah0+3u/sIParkhKtWyB/KMbdeoc60Ha1DLYqKr3XkTY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YDMMDXirMk7dt8UtNT9oyfywfw4+5RRP2ViaIDnHliiWi7Hx8isDsHmso61kmI6MD d1ZfVH996x+jJLsgON77vokGQ2nuX+ZukocIVGQ6DcBcbQvHJXj9KVvx3KCaV0aetM kSsKovi1Er3kCg3XXSU5aVMfQxAlvP5WnA1bd2JVYOPZIGcIyuVDNFoGvs2Sr1L9Yp cCovEc4QoO/DWmaVeq2vaA2zFBT0x5DMzYjs6M1BCIm/CpssqdX/yWzYtTuesjHsfU WzBk32KSGnnwkfH0VlUXEOWJPZ2jRN8EnhAyF/7AS0Q6oImVpJyEUuPpeQM1+QsPXu WaLWh3ducOTgA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= , Hans de Goede , Sasha Levin , markgross@kernel.org, platform-driver-x86@vger.kernel.org Subject: [PATCH AUTOSEL 5.14 009/138] platform/x86: wmi: do not fail if disabling fails Date: Mon, 8 Nov 2021 12:44:35 -0500 Message-Id: <20211108174644.1187889-9-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211108174644.1187889-1-sashal@kernel.org> References: <20211108174644.1187889-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Barnabás Pőcze [ Upstream commit 1975718c488a39128f1f515b23ae61a5a214cc3d ] Previously, `__query_block()` would fail if the second WCxx method call failed. However, the WQxx method might have succeeded, and potentially allocated memory for the result. Instead of throwing away the result and potentially leaking memory, ignore the result of the second WCxx call. Signed-off-by: Barnabás Pőcze Link: https://lore.kernel.org/r/20210904175450.156801-25-pobrn@protonmail.com Reviewed-by: Hans de Goede Signed-off-by: Hans de Goede Signed-off-by: Sasha Levin --- drivers/platform/x86/wmi.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index 62e0d56a3332b..1d983de615fcd 100644 --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c @@ -353,7 +353,14 @@ static acpi_status __query_block(struct wmi_block *wblock, u8 instance, * the WQxx method failed - we should disable collection anyway. */ if ((block->flags & ACPI_WMI_EXPENSIVE) && ACPI_SUCCESS(wc_status)) { - status = acpi_execute_simple_method(handle, wc_method, 0); + /* + * Ignore whether this WCxx call succeeds or not since + * the previously executed WQxx method call might have + * succeeded, and returning the failing status code + * of this call would throw away the result of the WQxx + * call, potentially leaking memory. + */ + acpi_execute_simple_method(handle, wc_method, 0); } return status; -- 2.33.0