From c7aab894364860ac38d4bdb2d9ad5d39cea7df56 Mon Sep 17 00:00:00 2001 From: Robert Moore Date: Sat, 2 May 2009 11:48:37 -0700 Subject: [PATCH] --- yaml --- r: 144354 b: refs/heads/master c: 53951bd57dfe2da58f86cdf276719082d80d8485 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/acpica/rscalc.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index cd0388601602..f834fe6c1cac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 091438dd5668396328a3419abcbc6591159eb8d1 +refs/heads/master: 53951bd57dfe2da58f86cdf276719082d80d8485 diff --git a/trunk/drivers/acpi/acpica/rscalc.c b/trunk/drivers/acpi/acpica/rscalc.c index b6667ff059e5..88b5a2c4814d 100644 --- a/trunk/drivers/acpi/acpica/rscalc.c +++ b/trunk/drivers/acpi/acpica/rscalc.c @@ -543,6 +543,13 @@ acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object, package_element = *top_object_list; + /* We must have a valid Package object */ + + if (!package_element || + (package_element->common.type != ACPI_TYPE_PACKAGE)) { + return_ACPI_STATUS (AE_AML_OPERAND_TYPE); + } + /* * The sub_object_list will now point to an array of the * four IRQ elements: Address, Pin, Source and source_index