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,
                 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
@@ -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);