summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/exoparg1.c
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2013-08-08 15:29:58 +0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-08-13 13:14:15 +0200
commita50abf4842dd7d603a2ad6dcc7f1467fd2a66f03 (patch)
treee872ae70215498c551be7048c61cf4ea1c0b2233 /drivers/acpi/acpica/exoparg1.c
parent1d82980c99ef2a91459ea39627d8114befb2c895 (diff)
downloadlinux-a50abf4842dd7d603a2ad6dcc7f1467fd2a66f03.tar.bz2
ACPICA: Return error if DerefOf resolves to a null package element.
Disallow the dereference of a reference (via index) to an uninitialized package element. Provides compatibility with other ACPI implementations. ACPICA BZ 1003. References: https://bugs.acpica.org/show_bug.cgi?id=431 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>
Diffstat (limited to 'drivers/acpi/acpica/exoparg1.c')
-rw-r--r--drivers/acpi/acpica/exoparg1.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/exoparg1.c b/drivers/acpi/acpica/exoparg1.c
index 3482df4a69f9..2cdd41d8ade6 100644
--- a/drivers/acpi/acpica/exoparg1.c
+++ b/drivers/acpi/acpica/exoparg1.c
@@ -962,10 +962,17 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
*/
return_desc =
*(operand[0]->reference.where);
- if (return_desc) {
- acpi_ut_add_reference
- (return_desc);
+ if (!return_desc) {
+ /*
+ * Element is NULL, do not allow the dereference.
+ * This provides compatibility with other ACPI
+ * implementations.
+ */
+ return_ACPI_STATUS
+ (AE_AML_UNINITIALIZED_ELEMENT);
}
+
+ acpi_ut_add_reference(return_desc);
break;
default: