Commit 1975718c authored by Barnabás Pőcze's avatar Barnabás Pőcze Committed by Hans de Goede
Browse files

platform/x86: wmi: do not fail if disabling fails 



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: default avatarBarnabás Pőcze <pobrn@protonmail.com>
Link: https://lore.kernel.org/r/20210904175450.156801-25-pobrn@protonmail.com


Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
parent 1c23ab91

drivers/platform/x86/wmi.c

+8 −1
Original line number Diff line number Diff line
@@ -352,7 +352,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;