aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Skorodumov <sdmitry@parallels.com>2015-07-28 18:38:32 +0400
committerSasha Levin <sasha.levin@oracle.com>2015-08-27 13:25:49 -0400
commit3c239f5a90855526c93c38687c1437a153d737eb (patch)
tree50b9b7a645d30597b823e8af3c5027b1483c48f1
parent7e4ac93416bb7dbe1ef270e00d3659ab9f89aa29 (diff)
downloadlinux-linaro-stable-3c239f5a90855526c93c38687c1437a153d737eb.tar.gz
x86/efi: Use all 64 bit of efi_memmap in setup_e820()
[ Upstream commit 7cc03e48965453b5df1cce5062c826189b04b960 ] The efi_info structure stores low 32 bits of memory map in efi_memmap and high 32 bits in efi_memmap_hi. While constructing pointer in the setup_e820(), need to take into account all 64 bit of the pointer. It is because on 64bit machine the function efi_get_memory_map() may return full 64bit pointer and before the patch that pointer was truncated. The issue is triggered on Parallles virtual machine and fixed with this patch. Signed-off-by: Dmitry Skorodumov <sdmitry@parallels.com> Cc: Denis V. Lunev <den@openvz.org> Cc: <stable@vger.kernel.org> Signed-off-by: Matt Fleming <matt.fleming@intel.com> Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
-rw-r--r--arch/x86/boot/compressed/eboot.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index 3790a66d6898..acdf06bc418b 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -1194,6 +1194,10 @@ static efi_status_t setup_e820(struct boot_params *params,
unsigned int e820_type = 0;
unsigned long m = efi->efi_memmap;
+#ifdef CONFIG_X86_64
+ m |= (u64)efi->efi_memmap_hi << 32;
+#endif
+
d = (efi_memory_desc_t *)(m + (i * efi->efi_memdesc_size));
switch (d->type) {
case EFI_RESERVED_TYPE: