Jesse Keating 2f82dda
From: Paul Rolland <rol@as2917.net>
Jesse Keating 2f82dda
Date: Wed, 30 Dec 2009 06:19:12 +0000 (-0500)
Jesse Keating 2f82dda
Subject: wmi: check find_guid() return value to prevent oops
Jesse Keating 2f82dda
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=b58454ec25e80fdb84e294758aeb22dd6d5ee6f9
Jesse Keating 2f82dda
Jesse Keating 2f82dda
wmi: check find_guid() return value to prevent oops
Jesse Keating 2f82dda
Jesse Keating 2f82dda
Signed-off-by: rol@as2917.net <Paul Rolland>
Jesse Keating 2f82dda
Signed-off-by: Len Brown <len.brown@intel.com>
Jesse Keating 2f82dda
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Jesse Keating 2f82dda
---
Jesse Keating 2f82dda
Jesse Keating 2f82dda
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
Jesse Keating 2f82dda
index 9f93d6c..cc9ad74 100644
Jesse Keating 2f82dda
--- a/drivers/platform/x86/wmi.c
Jesse Keating 2f82dda
+++ b/drivers/platform/x86/wmi.c
Jesse Keating 2f82dda
@@ -492,8 +492,7 @@ wmi_notify_handler handler, void *data)
Jesse Keating 2f82dda
 	if (!guid || !handler)
Jesse Keating 2f82dda
 		return AE_BAD_PARAMETER;
Jesse Keating 2f82dda
 
Jesse Keating 2f82dda
-	find_guid(guid, &block);
Jesse Keating 2f82dda
-	if (!block)
Jesse Keating 2f82dda
+	if (!find_guid(guid, &block))
Jesse Keating 2f82dda
 		return AE_NOT_EXIST;
Jesse Keating 2f82dda
 
Jesse Keating 2f82dda
 	if (block->handler)
Jesse Keating 2f82dda
@@ -521,8 +520,7 @@ acpi_status wmi_remove_notify_handler(const char *guid)
Jesse Keating 2f82dda
 	if (!guid)
Jesse Keating 2f82dda
 		return AE_BAD_PARAMETER;
Jesse Keating 2f82dda
 
Jesse Keating 2f82dda
-	find_guid(guid, &block);
Jesse Keating 2f82dda
-	if (!block)
Jesse Keating 2f82dda
+	if (!find_guid(guid, &block))
Jesse Keating 2f82dda
 		return AE_NOT_EXIST;
Jesse Keating 2f82dda
 
Jesse Keating 2f82dda
 	if (!block->handler)