From 51d6cda1a33d78c2a32d057fd45097d1fcbf8daf Mon Sep 17 00:00:00 2001 From: Artem Savkov Date: Wed, 20 Mar 2013 15:07:50 +1100 Subject: [PATCH] dmi_scan: proper buf type in dmi_present() buf needs to be unsigned in dmi_present(), otherwise dmi_base calculation doesn't work properly leading to a wraparound during dmi_ioremap: [ 0.000000] ------------[ cut here ]------------ [ 0.000000] WARNING: at arch/x86/mm/ioremap.c:524 __early_ioremap+0x85/0x18a() [ 0.000000] Modules linked in: [ 0.000000] Pid: 0, comm: swapper Not tainted 3.9.0-rc2-next-20130312 #283 [ 0.000000] Call Trace: [ 0.000000] [] warn_slowpath_common+0x72/0xa0 [ 0.000000] [] ? __early_ioremap+0x85/0x18a [ 0.000000] [] ? __early_ioremap+0x85/0x18a [ 0.000000] [] warn_slowpath_null+0x22/0x30 [ 0.000000] [] __early_ioremap+0x85/0x18a [ 0.000000] [] ? __early_ioremap+0xfc/0x18a [ 0.000000] [] early_ioremap+0xd/0xf [ 0.000000] [] dmi_present+0xf5/0x22a [ 0.000000] [] dmi_scan_machine+0xbf/0x11c [ 0.000000] [] setup_arch+0x4db/0xca0 [ 0.000000] [] ? printk+0x3d/0x3f [ 0.000000] [] start_kernel+0x7b/0x329 [ 0.000000] [] i386_start_kernel+0x137/0x13a [ 0.000000] ---[ end trace 4eaa2a86a8e2da22 ]--- [ 0.000000] DMI not present or invalid. Introduced in "dmi_scan: refactor dmi_scan_machine(), {smbios,dmi}_present()" Signed-off-by: Artem Savkov Acked-by: Ben Hutchings Cc: Zhenzhong Duan Signed-off-by: Andrew Morton --- drivers/firmware/dmi_scan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index 3439f59123ed..40e940d4db6b 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c @@ -410,7 +410,7 @@ static void __init dmi_dump_ids(void) printk(KERN_CONT "\n"); } -static int __init dmi_present(const char *buf) +static int __init dmi_present(const u8 *buf) { int smbios_ver; -- 2.39.5