diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-03-28 13:52:59 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-03-28 13:52:59 +0100 |
| commit | 6125c2be96b941a08e05516cfa1125ca53945bb2 (patch) | |
| tree | 9e13412f2d8002047f65ce88243891afe1539e5d /drivers/acpi/apei/cper.c | |
| parent | 887ede6661768a9d02d1f4b54ff719568473e00b (diff) | |
| parent | b8b6611048b7b57b86fbdc9153649ad4dc52135f (diff) | |
Merge branch 'acpi-fixes' into fixes
* acpi-fixes:
PCI / ACPI: hold acpi_scan_lock during root bus hotplug
ACPI / APEI: fix error status check condition for CPER
ACPI / PM: fix suspend and resume on Sony Vaio VGN-FW21M
Diffstat (limited to 'drivers/acpi/apei/cper.c')
| -rw-r--r-- | drivers/acpi/apei/cper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/apei/cper.c b/drivers/acpi/apei/cper.c index 1e5d8a40101e..fefc2ca7cc3e 100644 --- a/drivers/acpi/apei/cper.c +++ b/drivers/acpi/apei/cper.c @@ -405,7 +405,7 @@ int apei_estatus_check(const struct acpi_hest_generic_status *estatus) return rc; data_len = estatus->data_length; gdata = (struct acpi_hest_generic_data *)(estatus + 1); - while (data_len > sizeof(*gdata)) { + while (data_len >= sizeof(*gdata)) { gedata_len = gdata->error_data_length; if (gedata_len > data_len - sizeof(*gdata)) return -EINVAL; |