diff options
author | Bob Moore <robert.moore@intel.com> | 2013-03-08 04:19:38 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-03-11 19:45:03 -0400 |
commit | c13085e519e8984fede41fa3d6a5502523b10996 (patch) | |
tree | c993b660f58d41ab46b93c4a810517de6f9ab072 /drivers/acpi/acpica/rslist.c | |
parent | f6161aa153581da4a3867a2d1a7caf4be19b6ec9 (diff) |
ACPICA: Resource Mgr: Prevent infinite loops in resource walks
Add checks for zero-length resource descriptors in all code that
loops through a resource descriptor list. This prevents possible
infinite loops because the length is used to increment the traveral
pointer and detect the end-of-descriptor.
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/rslist.c')
-rw-r--r-- | drivers/acpi/acpica/rslist.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/rslist.c b/drivers/acpi/acpica/rslist.c index ee2e206fc6c8..6053aa182093 100644 --- a/drivers/acpi/acpica/rslist.c +++ b/drivers/acpi/acpica/rslist.c | |||
@@ -178,6 +178,14 @@ acpi_rs_convert_resources_to_aml(struct acpi_resource *resource, | |||
178 | return_ACPI_STATUS(AE_BAD_DATA); | 178 | return_ACPI_STATUS(AE_BAD_DATA); |
179 | } | 179 | } |
180 | 180 | ||
181 | /* Sanity check the length. It must not be zero, or we loop forever */ | ||
182 | |||
183 | if (!resource->length) { | ||
184 | ACPI_ERROR((AE_INFO, | ||
185 | "Invalid zero length descriptor in resource list\n")); | ||
186 | return_ACPI_STATUS(AE_AML_BAD_RESOURCE_LENGTH); | ||
187 | } | ||
188 | |||
181 | /* Perform the conversion */ | 189 | /* Perform the conversion */ |
182 | 190 | ||
183 | if (resource->type == ACPI_RESOURCE_TYPE_SERIAL_BUS) { | 191 | if (resource->type == ACPI_RESOURCE_TYPE_SERIAL_BUS) { |