dmi: Avoid unaligned memory access in save_mem_devices()
authorLuck, Tony <tony.luck@intel.com>
Fri, 1 Nov 2013 20:59:52 +0000 (13:59 -0700)
committerIngo Molnar <mingo@kernel.org>
Sun, 3 Nov 2013 09:40:12 +0000 (10:40 +0100)
Firmware is not required to maintain alignment of SMBIOS
entries, so we should take care accessing fields within these
structures. Use "get_unaligned()" to avoid problems.

[ Found on ia64 (which grumbles about unaligned access) ]

Signed-off-by: Tony Luck <tony.luck@intel.com>
Cc: Chen Gong <gong.chen@linux.intel.com>
Link: http://lkml.kernel.org/r/27d82dbff5be1025bf18ab88498632d36c2fcf3c.1383331440.git.tony.luck@intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
drivers/firmware/dmi_scan.c

index 59579a7..c7e81ff 100644 (file)
@@ -8,6 +8,7 @@
 #include <linux/bootmem.h>
 #include <linux/random.h>
 #include <asm/dmi.h>
+#include <asm/unaligned.h>
 
 /*
  * DMI stands for "Desktop Management Interface".  It is part
@@ -347,7 +348,7 @@ static void __init save_mem_devices(const struct dmi_header *dm, void *v)
                pr_warn(FW_BUG "Too many DIMM entries in SMBIOS table\n");
                return;
        }
-       dmi_memdev[nr].handle = dm->handle;
+       dmi_memdev[nr].handle = get_unaligned(&dm->handle);
        dmi_memdev[nr].device = dmi_string(dm, d[0x10]);
        dmi_memdev[nr].bank = dmi_string(dm, d[0x11]);
        nr++;