summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThadeu Lima de Souza Cascardo <cascardo@holoscopio.com>2010-11-28 19:46:50 -0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-12-09 13:33:26 -0800
commit2dedf88ded12897aa394f09aa675038d96d79670 (patch)
tree9def452d9c5d70e57d82335c43dd8863ea5caf89
parent53e87163a135b1c868f31327c7f0b34feb605506 (diff)
downloadlinux-3.10-2dedf88ded12897aa394f09aa675038d96d79670.tar.gz
linux-3.10-2dedf88ded12897aa394f09aa675038d96d79670.tar.bz2
linux-3.10-2dedf88ded12897aa394f09aa675038d96d79670.zip
wmi: use memcmp instead of strncmp to compare GUIDs
commit 8b14d7b22c61f17ccb869e0047d9df6dd9f50a9f upstream. While looking for the duplicates in /sys/class/wmi/, I couldn't find them. The code that looks for duplicates uses strncmp in a binary GUID, which may contain zero bytes. The right function is memcmp, which is also used in another section of wmi code. It was finding 49142400-C6A3-40FA-BADB-8A2652834100 as a duplicate of 39142400-C6A3-40FA-BADB-8A2652834100. Since the first byte is the fourth printed, they were found as equal by strncmp. Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com> Signed-off-by: Matthew Garrett <mjg@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/platform/x86/wmi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index b2978a04317..677783475d8 100644
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -801,7 +801,7 @@ static bool guid_already_parsed(const char *guid_string)
wblock = list_entry(p, struct wmi_block, list);
gblock = &wblock->gblock;
- if (strncmp(gblock->guid, guid_string, 16) == 0)
+ if (memcmp(gblock->guid, guid_string, 16) == 0)
return true;
}
return false;