From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from cantor2.suse.de ([195.135.220.15] helo=mx2.suse.de) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WT2Ko-0003ao-DY for kexec@lists.infradead.org; Thu, 27 Mar 2014 04:54:35 +0000 Message-ID: <5333AEEB.4090100@suse.de> Date: Wed, 26 Mar 2014 21:54:03 -0700 From: Tony Jones MIME-Version: 1.0 Subject: PATCH: kexec/i386: fix erroneous memory descriptor message List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+dwmw2=twosheds.infradead.org@lists.infradead.org To: kexec@lists.infradead.org Cc: Simon Horman , dyoung@redhat.com On non-EFI systems, efi_info section of boot_params is zero filled resulting in an erroneous message from kexec regarding "efi memory descriptor" version. Caused by commit: e1ffc9e9a0769e1f54185003102e9bec428b84e8 "Passing efi related data via setup_data" # od -j 448 -N 32 -v -x /sys/kernel/boot_params/data 0000700 0000 0000 0000 0000 0000 0000 0000 0000 0000720 0000 0000 0000 0000 0000 0000 0000 0000 0000740 # kexec -l --reuse-cmdline --initrd=/boot/initrd-`uname -r` /boot/vmlinuz-`uname -r` efi memory descriptor version 0 is not supported! Signed-off-by: Tony Jones --- kexec/arch/i386/x86-linux-setup.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) --- a/kexec/arch/i386/x86-linux-setup.c +++ b/kexec/arch/i386/x86-linux-setup.c @@ -687,17 +687,25 @@ static void setup_efi_info(struct kexec_ ret = get_bootparam(&real_mode->efi_info, offset, 32); if (ret) return; + if (((struct efi_info *)real_mode->efi_info)->efi_memmap_size == 0) + /* zero filled efi_info */ + goto out; desc_version = get_efi_mem_desc_version(real_mode); if (desc_version != 1) { fprintf(stderr, "efi memory descriptor version %d is not supported!\n", desc_version); - memset(&real_mode->efi_info, 0, 32); - return; + goto out; } ret = setup_efi_data(info, real_mode); if (ret) - memset(&real_mode->efi_info, 0, 32); + goto out; + + return; + +out: + memset(&real_mode->efi_info, 0, 32); + return; } void setup_linux_system_parameters(struct kexec_info *info, _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec