wmi: use memcmp instead of strncmp to compare GUIDs
PATCH 1/1 wmi: use memcmp instead of strncmp to compare GUIDs
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.
--- drivers/platform/x86/wmi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/platform/x86/wmi.c +1 -1
@@ -755,7 +755,7 @@ static bool guid_already_parsed(const char *guid_string)struct wmi_block *wblock;list_for_each_entry (wblock, &wmi_block_list, list) -if (strncmp (wblock->gblock.guid, guid_string,16 ) ==0 ) +if (memcmp (wblock->gblock.guid, guid_string,16 ) ==0 )return true;return false;
Signature · 1 line
1.7.2.3
Quoted 20 lines · Thadeu Lima de Souza Cascardo
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 <[email protected]>--- drivers/platform/x86/wmi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/platform/x86/wmi.c +0
-0
drivers/platform/x86/wmi.c static bool guid_already_parsed(const char *guid_string) · line 761
Quoted 8 lines
drivers/platform/x86/wmi.c +1
-1@@ -755,7 +755,7 @@ static bool guid_already_parsed(const char *guid_string)struct wmi_block *wblock;list_for_each_entry (wblock, &wmi_block_list, list) -if (strncmp (wblock->gblock.guid, guid_string,16 ) ==0 ) +if (memcmp (wblock->gblock.guid, guid_string,16 ) ==0 )return true;return false;
Looks right to me.
Signature · 3 lines
Jesper Juhl <[email protected]> http://www.chaosbits.net/ Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html Plain text mails only, please.
Matthew Garrett
AppliedApplied to -next, thanks.
Signature · 1 line
Matthew Garrett | [email protected]
Quoted 4 lines · Matthew Garrett
Applied to -next, thanks.
Signature · 1 line
Matthew Garrett | [email protected]
Hello, Matthew.
I consider this one a serious bug and with a trivial fix that should go to Linus, for the next release candidate. I also consider it should go to stable releases, and that's why I'm copying stable.
Any out-of-tree wmi driver written for systems with two or more GUIDs containing any '\0' byte with a common prefix will fail to load because of this bug. I've hit that, and that's how I found the bug.
Regards,
Cascardo.
Quoted 11 lines · Thadeu Lima de Souza Cascardo
Quoted 4 lines · Matthew Garrett
Applied to -next, thanks.
Signature · 1 line
Matthew Garrett | [email protected]Hello, Matthew.
I consider this one a serious bug and with a trivial fix that should go to Linus, for the next release candidate. I also consider it should go to stable releases, and that's why I'm copying stable.
Sure, I'll pull it back for .37 as well.
Signature · 1 line
Matthew Garrett | [email protected]