From 0841c04d65937ad2808f59c43cb54a92473c8f0e Mon Sep 17 00:00:00 2001 From: "Luck, Tony" Date: Fri, 1 Nov 2013 13:59:52 -0700 Subject: [PATCH] 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: Tony Luck Cc: Chen Gong Link: http://lkml.kernel.org/r/27d82dbff5be1025bf18ab88498632d36c2fcf3c.1383331440.git.tony.luck@intel.com Signed-off-by: Ingo Molnar --- drivers/firmware/dmi_scan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index 59579a744d58..c7e81ff8f3ef 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c @@ -8,6 +8,7 @@ #include #include #include +#include /* * 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++; -- 2.20.1