Skip to content

Commit

Permalink
ACPICA: Improve parameter validation for acpi_install_gpe_block.
Browse files Browse the repository at this point in the history
Add the following checks:
1) The incoming device handle refers to type ACPI_TYPE_DEVICE.
2) There is not already a gpe block attached to the device.

Likewise, with acpi_remove_gpe_block, ensure that the incoming object
is a device.

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>
  • Loading branch information
Bob Moore authored and Rafael J. Wysocki committed Feb 10, 2014
1 parent d72c17a commit 9186fb5
Showing 1 changed file with 19 additions and 0 deletions.
19 changes: 19 additions & 0 deletions drivers/acpi/acpica/evxfgpe.c
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,18 @@ acpi_install_gpe_block(acpi_handle gpe_device,
goto unlock_and_exit;
}

/* Validate the parent device */

if (node->type != ACPI_TYPE_DEVICE) {
status = AE_TYPE;
goto unlock_and_exit;
}

if (node->object) {
status = AE_ALREADY_EXISTS;
goto unlock_and_exit;
}

/*
* For user-installed GPE Block Devices, the gpe_block_base_number
* is always zero
Expand Down Expand Up @@ -666,6 +678,13 @@ acpi_status acpi_remove_gpe_block(acpi_handle gpe_device)
goto unlock_and_exit;
}

/* Validate the parent device */

if (node->type != ACPI_TYPE_DEVICE) {
status = AE_TYPE;
goto unlock_and_exit;
}

/* Get the device_object attached to the node */

obj_desc = acpi_ns_get_attached_object(node);
Expand Down

0 comments on commit 9186fb5

Please sign in to comment.