ACPICA: Prevent infinite loops when traversing corrupted lists.
This change hardens the ACPICA code to detect circular linked object lists and prevent an infinite loop if such corruption exists. 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>
This commit is contained in:

committed by
Rafael J. Wysocki

parent
a487af33a4
commit
f953529f3b
@@ -314,6 +314,7 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj,
|
||||
{
|
||||
union acpi_operand_object *handler_obj;
|
||||
union acpi_operand_object *obj_desc;
|
||||
union acpi_operand_object *start_desc;
|
||||
union acpi_operand_object **last_obj_ptr;
|
||||
acpi_adr_space_setup region_setup;
|
||||
void **region_context;
|
||||
@@ -341,6 +342,7 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj,
|
||||
/* Find this region in the handler's list */
|
||||
|
||||
obj_desc = handler_obj->address_space.region_list;
|
||||
start_desc = obj_desc;
|
||||
last_obj_ptr = &handler_obj->address_space.region_list;
|
||||
|
||||
while (obj_desc) {
|
||||
@@ -438,6 +440,15 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj,
|
||||
|
||||
last_obj_ptr = &obj_desc->region.next;
|
||||
obj_desc = obj_desc->region.next;
|
||||
|
||||
/* Prevent infinite loop if list is corrupted */
|
||||
|
||||
if (obj_desc == start_desc) {
|
||||
ACPI_ERROR((AE_INFO,
|
||||
"Circular handler list in region object %p",
|
||||
region_obj));
|
||||
return_VOID;
|
||||
}
|
||||
}
|
||||
|
||||
/* If we get here, the region was not in the handler's region list */
|
||||
|
Reference in New Issue
Block a user