|
From: | Anthony Liguori |
Subject: | Re: [Qemu-devel] [PATCH] multiboot: Prevent loading of x86_64 images |
Date: | Tue, 16 Nov 2010 14:09:17 -0600 |
User-agent: | Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.15) Gecko/20101027 Lightning/1.0b1 Thunderbird/3.0.10 |
On 11/04/2010 05:22 PM, Adam Lackorzynski wrote:
A via -kernel supplied x86_64 ELF image is being started in 32bit mode. Detect and exit if a 64bit image has been supplied. Signed-off-by: Adam Lackorzynski<address@hidden> Acked-by: Alexander Graf<address@hidden>
Applied. Thanks. Regards, Anthony Liguori
--- hw/multiboot.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/hw/multiboot.c b/hw/multiboot.c index f9097a2..e710bbb 100644 --- a/hw/multiboot.c +++ b/hw/multiboot.c @@ -171,6 +171,12 @@ int load_multiboot(void *fw_cfg, uint64_t elf_low, elf_high; int kernel_size; fclose(f); + + if (((struct elf64_hdr*)header)->e_machine == EM_X86_64) { + fprintf(stderr, "Cannot load x86-64 image, give a 32bit one.\n"); + exit(1); + } + kernel_size = load_elf(kernel_filename, NULL, NULL,&elf_entry, &elf_low,&elf_high, 0, ELF_MACHINE, 0); if (kernel_size< 0) {
[Prev in Thread] | Current Thread | [Next in Thread] |