diff options
| author | Adam Lackorzynski <adam@os.inf.tu-dresden.de> | 2010-11-04 23:22:15 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-11-16 09:31:18 -0600 |
| commit | 9696846600cac4bd0dfd6835e45e69d25ec2b11e (patch) | |
| tree | 93a557ef00077b03fd0f265f990d42bb0106a672 /hw | |
| parent | b538e53ee7e8b9e2920d3286b480276cef209fd4 (diff) | |
| download | qemu-9696846600cac4bd0dfd6835e45e69d25ec2b11e.zip qemu-9696846600cac4bd0dfd6835e45e69d25ec2b11e.tar.gz qemu-9696846600cac4bd0dfd6835e45e69d25ec2b11e.tar.bz2 | |
multiboot: Prevent loading of x86_64 images
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 <adam@os.inf.tu-dresden.de>
Acked-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | 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) { |