Commit 0841c04d authored by Luck, Tony's avatar Luck, Tony Committed by Ingo Molnar

dmi: Avoid unaligned memory access in save_mem_devices()

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: default avatarTony 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.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent d61ec845
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include <linux/bootmem.h> #include <linux/bootmem.h>
#include <linux/random.h> #include <linux/random.h>
#include <asm/dmi.h> #include <asm/dmi.h>
#include <asm/unaligned.h>
/* /*
* DMI stands for "Desktop Management Interface". It is part * 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) ...@@ -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"); pr_warn(FW_BUG "Too many DIMM entries in SMBIOS table\n");
return; 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].device = dmi_string(dm, d[0x10]);
dmi_memdev[nr].bank = dmi_string(dm, d[0x11]); dmi_memdev[nr].bank = dmi_string(dm, d[0x11]);
nr++; nr++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment