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 EEE0CC433EF for ; Tue, 9 Nov 2021 01:22:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DA58A610A2 for ; Tue, 9 Nov 2021 01:22:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241726AbhKIBZb (ORCPT ); Mon, 8 Nov 2021 20:25:31 -0500 Received: from mail.kernel.org ([198.145.29.99]:50112 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243304AbhKIBVN (ORCPT ); Mon, 8 Nov 2021 20:21:13 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id A5B5B61B20; Tue, 9 Nov 2021 01:08:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1636420093; bh=U2vWZSCXWfeYo7OvMkU8L1M/+CKcvFhA9UzCXwRKQiI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lflqatGiSgUWiFHMK0YBN3ouJrV6964NO4+XI4ZJ2hdU4M20vFC0vMQcTdUnrq5yc D5tj8DIqjmFdF3Nr/KgMYW5JnqYsHL7CQvkELK1Z3s4Uv+asrUZF1sJvrTfBLued4g voLgnoTszABVf9tdaiPTHDtY49+76fqtzXBqzk7otaAbwqKRCBg2SN6VrCxw9zz6jF LvDOVDQpCkDoG0mIEsRkqwPRI0goowwd728bsIUBvhSj7jeFQh0mhzLy/lcbke3imL EplYPlaFpDMNIOmJ2jgvgKQzfFgjFt3XiLP70+lfWPo3pCdxBd2mHSThoMFmslTvSN ZwExMk2MrBNVA== 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 4.9 03/33] platform/x86: wmi: do not fail if disabling fails Date: Mon, 8 Nov 2021 20:07:37 -0500 Message-Id: <20211109010807.1191567-3-sashal@kernel.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211109010807.1191567-1-sashal@kernel.org> References: <20211109010807.1191567-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 00d82e8443bdd..da06284c455dc 100644 --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c @@ -289,7 +289,14 @@ struct acpi_buffer *out) * 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