Commit 96968466 authored by Adam Lackorzynski's avatar Adam Lackorzynski Committed by Anthony Liguori
Browse files

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: default avatarAdam Lackorzynski <adam@os.inf.tu-dresden.de>
Acked-by: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent b538e53e

hw/multiboot.c

+6 −0
Original line number Diff line number Diff line
@@ -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) {