Commit 9f9c9cbb6057 ("drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it exists") hoisted the check for "_DMI_" into dmi_scan_machine(), which means that we don't bother to check for "_DMI_" at offset 16 in an SMBIOS entry. smbios_present() may also call dmi_present() for an address where we found "_SM_", if it failed further validation. Check for "_DMI_" in smbios_present() before calling dmi_present(). [akpm@linux-foundation.org: fix build] Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Reported-by: Tim McGrath <tmhikaru@gmail.com> Tested-by: Tim Mcgrath <tmhikaru@gmail.com> Cc: Zhenzhong Duan <zhenzhong.duan@oracle.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Unified · Split
| @@ -442,7 +442,6 @@ static int __init dmi_present(const char __iomem *p) · 441 unmodified lines | |||
| 442 | static int __init smbios_present(const char __iomem *p) | 442 | static int __init smbios_present(const char __iomem *p) |
| 443 | { | 443 | { |
| 444 | u8 buf[32]; | 444 | u8 buf[32]; |
| 445 | int offset = 0; | ||
| 446 | 445 | ||
| 447 | memcpy_fromio(buf, p, 32); | 446 | memcpy_fromio(buf, p, 32); |
| 448 | if ((buf[5] < 32) && dmi_checksum(buf, buf[5])) { | 447 | if ((buf[5] < 32) && dmi_checksum(buf, buf[5])) { |
| @@ -461,9 +460,9 @@ static int __init smbios_present(const char __iomem *p) · 12 unmodified lines | |||
| 461 | dmi_ver = 0x0206; | 460 | dmi_ver = 0x0206; |
| 462 | break; | 461 | break; |
| 463 | } | 462 | } |
| 464 | offset = 16; | 463 | return memcmp(p + 16, "_DMI_", 5) || dmi_present(p + 16); |
| 465 | } | 464 | } |
| 466 | return dmi_present(buf + offset); | 465 | return 1; |
| 467 | } | 466 | } |
| 468 | 467 | ||
| 469 | void __init dmi_scan_machine(void) | 468 | void __init dmi_scan_machine(void) |