mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
ACPICA: ACPICA: add status check for acpi_hw_read before assigning return value
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 <mark.gross@intel.com> Signed-off-by: Erik Schmauss <erik.schmauss@intel.com> [ rjw: Changelog ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
parent
d46b6537f0
commit
f016b19a92
1 changed files with 7 additions and 2 deletions
|
@ -528,13 +528,18 @@ acpi_status acpi_hw_register_read(u32 register_id, u32 *return_value)
|
|||
|
||||
status =
|
||||
acpi_hw_read(&value64, &acpi_gbl_FADT.xpm2_control_block);
|
||||
value = (u32)value64;
|
||||
if (ACPI_SUCCESS(status)) {
|
||||
value = (u32)value64;
|
||||
}
|
||||
break;
|
||||
|
||||
case ACPI_REGISTER_PM_TIMER: /* 32-bit access */
|
||||
|
||||
status = acpi_hw_read(&value64, &acpi_gbl_FADT.xpm_timer_block);
|
||||
value = (u32)value64;
|
||||
if (ACPI_SUCCESS(status)) {
|
||||
value = (u32)value64;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case ACPI_REGISTER_SMI_COMMAND_BLOCK: /* 8-bit access */
|
||||
|
|
Loading…
Reference in a new issue