diff options
| author | David Edmondson <david.edmondson@oracle.com> | 2021-03-02 09:03:15 +0000 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-03-06 11:41:54 +0100 |
| commit | e20e182ea0ab5c16557603f457fe0db445b63726 (patch) | |
| tree | 1e737415a5394665b6579fcc0c0c0eef6f2f9995 /hw | |
| parent | 64d70277114b069579c96e6daf83922b9eacc383 (diff) | |
| download | qemu-e20e182ea0ab5c16557603f457fe0db445b63726.zip qemu-e20e182ea0ab5c16557603f457fe0db445b63726.tar.gz qemu-e20e182ea0ab5c16557603f457fe0db445b63726.tar.bz2 | |
x86/pvh: extract only 4 bytes of start address for 32 bit kernels
When loading the PVH start address from a 32 bit ELF note, extract
only the appropriate number of bytes.
Fixes: ab969087da65 ("pvh: Boot uncompressed kernel using direct boot ABI")
Signed-off-by: David Edmondson <david.edmondson@oracle.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Message-Id: <20210302090315.3031492-3-david.edmondson@oracle.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/i386/x86.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/i386/x86.c b/hw/i386/x86.c index 6329f90..7865660 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -690,6 +690,8 @@ static uint64_t read_pvh_start_addr(void *arg1, void *arg2, bool is64) elf_note_data_addr = ((void *)nhdr64) + nhdr_size64 + QEMU_ALIGN_UP(nhdr_namesz, phdr_align); + + pvh_start_addr = *elf_note_data_addr; } else { struct elf32_note *nhdr32 = (struct elf32_note *)arg1; uint32_t nhdr_size32 = sizeof(struct elf32_note); @@ -699,9 +701,9 @@ static uint64_t read_pvh_start_addr(void *arg1, void *arg2, bool is64) elf_note_data_addr = ((void *)nhdr32) + nhdr_size32 + QEMU_ALIGN_UP(nhdr_namesz, phdr_align); - } - pvh_start_addr = *elf_note_data_addr; + pvh_start_addr = *(uint32_t *)elf_note_data_addr; + } return pvh_start_addr; } |