From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-bn3nam01on0139.outbound.protection.outlook.com ([104.47.33.139]:5979 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727615AbeH3WHE (ORCPT ); Thu, 30 Aug 2018 18:07:04 -0400 From: Sasha Levin To: "stable@vger.kernel.org" CC: Erik Schmauss , "Rafael J . Wysocki" , Sasha Levin Subject: [PATCH AUTOSEL 4.18 047/113] ACPICA: ACPICA: add status check for acpi_hw_read before assigning return value Date: Thu, 30 Aug 2018 18:03:07 +0000 Message-ID: <20180830180050.35735-47-alexander.levin@microsoft.com> References: <20180830180050.35735-1-alexander.levin@microsoft.com> In-Reply-To: <20180830180050.35735-1-alexander.levin@microsoft.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org List-ID: From: Erik Schmauss [ Upstream commit f016b19a9275089a2ab06c2144567c2ad8d5d6ad ] The value coming from acpi_hw_read() should not be used if it returns an error code, so check the status returned by it before using that value in two places in acpi_hw_register_read(). Reported-by: Mark Gross Signed-off-by: Erik Schmauss [ rjw: Changelog ] Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/acpi/acpica/hwregs.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/acpica/hwregs.c b/drivers/acpi/acpica/hwregs.c index 3de794bcf8fa..69603ba52a3a 100644 --- a/drivers/acpi/acpica/hwregs.c +++ b/drivers/acpi/acpica/hwregs.c @@ -528,13 +528,18 @@ acpi_status acpi_hw_register_read(u32 register_id, u3= 2 *return_value) =20 status =3D acpi_hw_read(&value64, &acpi_gbl_FADT.xpm2_control_block); - value =3D (u32)value64; + if (ACPI_SUCCESS(status)) { + value =3D (u32)value64; + } break; =20 case ACPI_REGISTER_PM_TIMER: /* 32-bit access */ =20 status =3D acpi_hw_read(&value64, &acpi_gbl_FADT.xpm_timer_block); - value =3D (u32)value64; + if (ACPI_SUCCESS(status)) { + value =3D (u32)value64; + } + break; =20 case ACPI_REGISTER_SMI_COMMAND_BLOCK: /* 8-bit access */ --=20 2.17.1