diff options
| author | Jamie Iles | 2021-11-11 15:11:40 +0100 |
|---|---|---|
| committer | Alistair Francis | 2022-06-10 01:31:42 +0200 |
| commit | af9751316e53cdf7e98131afe6928a5f4445fe16 (patch) | |
| tree | 3af26f7aaa3c24eef6983ffe93b783bad3859908 /hw/riscv | |
| parent | hw/intc: sifive_plic: Avoid overflowing the addr_config buffer (diff) | |
| download | qemu-af9751316e53cdf7e98131afe6928a5f4445fe16.tar.gz qemu-af9751316e53cdf7e98131afe6928a5f4445fe16.tar.xz qemu-af9751316e53cdf7e98131afe6928a5f4445fe16.zip | |
hw/core/loader: return image sizes as ssize_t
Various loader functions return an int which limits images to 2GB which
is fine for things like a BIOS/kernel image, but if we want to be able
to load memory images or large ramdisks then any file over 2GB would
silently fail to load.
Cc: Luc Michel <lmichel@kalray.eu>
Signed-off-by: Jamie Iles <jamie@nuviainc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Luc Michel <lmichel@kalray.eu>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <20211111141141.3295094-2-jamie@nuviainc.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Diffstat (limited to 'hw/riscv')
| -rw-r--r-- | hw/riscv/boot.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c index 57a41df8e9..2d80f40b31 100644 --- a/hw/riscv/boot.c +++ b/hw/riscv/boot.c @@ -129,7 +129,8 @@ target_ulong riscv_load_firmware(const char *firmware_filename, hwaddr firmware_load_addr, symbol_fn_t sym_cb) { - uint64_t firmware_entry, firmware_size, firmware_end; + uint64_t firmware_entry, firmware_end; + ssize_t firmware_size; if (load_elf_ram_sym(firmware_filename, NULL, NULL, NULL, &firmware_entry, NULL, &firmware_end, NULL, @@ -185,7 +186,7 @@ target_ulong riscv_load_kernel(const char *kernel_filename, hwaddr riscv_load_initrd(const char *filename, uint64_t mem_size, uint64_t kernel_entry, hwaddr *start) { - int size; + ssize_t size; /* * We want to put the initrd far enough into RAM that when the |