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