aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2014-02-07 20:42:19 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-02-10 18:30:24 -0500
commit9186fb5807aadd30861ce9106afca8123524398c (patch)
tree3f2f948067345cc6c9a15e03df65097811601451
parentd72c17a8674fc143e1c7781e55fa362626353167 (diff)
ACPICA: Improve parameter validation for acpi_install_gpe_block.
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>
-rw-r--r--drivers/acpi/acpica/evxfgpe.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/evxfgpe.c b/drivers/acpi/acpica/evxfgpe.c
index 5713da77c665..b84f8e25717a 100644
--- a/drivers/acpi/acpica/evxfgpe.c
+++ b/drivers/acpi/acpica/evxfgpe.c
@@ -583,6 +583,18 @@ acpi_install_gpe_block(acpi_handle gpe_device,
583 goto unlock_and_exit; 583 goto unlock_and_exit;
584 } 584 }
585 585
586 /* Validate the parent device */
587
588 if (node->type != ACPI_TYPE_DEVICE) {
589 status = AE_TYPE;
590 goto unlock_and_exit;
591 }
592
593 if (node->object) {
594 status = AE_ALREADY_EXISTS;
595 goto unlock_and_exit;
596 }
597
586 /* 598 /*
587 * For user-installed GPE Block Devices, the gpe_block_base_number 599 * For user-installed GPE Block Devices, the gpe_block_base_number
588 * is always zero 600 * is always zero
@@ -666,6 +678,13 @@ acpi_status acpi_remove_gpe_block(acpi_handle gpe_device)
666 goto unlock_and_exit; 678 goto unlock_and_exit;
667 } 679 }
668 680
681 /* Validate the parent device */
682
683 if (node->type != ACPI_TYPE_DEVICE) {
684 status = AE_TYPE;
685 goto unlock_and_exit;
686 }
687
669 /* Get the device_object attached to the node */ 688 /* Get the device_object attached to the node */
670 689
671 obj_desc = acpi_ns_get_attached_object(node); 690 obj_desc = acpi_ns_get_attached_object(node);