Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent d61ec845

drivers/firmware/dmi_scan.c

+2 −1
Original line number Diff line number Diff line
@@ -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++;