From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Thu, 26 Aug 2010 07:15:03 +0000 (-0700)
Subject: WMI: fix potential NULL pointer dereference
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=3d2c63eb5e0abfd06b19928c8ed43020b3451a3c;p=deliverable%2Flinux.git

WMI: fix potential NULL pointer dereference

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
---

diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index a24a4b52c919..81552bca6ae4 100644
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -824,6 +824,8 @@ static acpi_status parse_wdg(acpi_handle handle)
 		return status;
 
 	obj = (union acpi_object *) out.pointer;
+	if (!obj)
+		return AE_ERROR;
 
 	if (obj->type != ACPI_TYPE_BUFFER) {
 		status = AE_ERROR;