From nobody Mon Feb 9 08:05:16 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1636640080294449.31949472448775; Thu, 11 Nov 2021 06:14:40 -0800 (PST) Received: from localhost ([::1]:39376 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mlAqc-0006sD-Rc for importer@patchew.org; Thu, 11 Nov 2021 09:14:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mlAoE-00054G-Nd for qemu-devel@nongnu.org; Thu, 11 Nov 2021 09:12:10 -0500 Received: from [2a00:1450:4864:20::531] (port=43871 helo=mail-ed1-x531.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mlAoC-00067P-6P for qemu-devel@nongnu.org; Thu, 11 Nov 2021 09:12:10 -0500 Received: by mail-ed1-x531.google.com with SMTP id w1so24742941edd.10 for ; Thu, 11 Nov 2021 06:11:56 -0800 (PST) Received: from localhost ([82.44.17.50]) by smtp.gmail.com with ESMTPSA id w16sm1047628edr.66.2021.11.11.06.11.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Nov 2021 06:11:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5BI4Lx12AwI6l9ha8+/bu3bisKYYHn2V9oD2R3uPz68=; b=71/Jlt4vcje5mMkglZJSDp6PWthsUqnmngURFwCbC71W3FgxZHmzvyr+JwfSOYQ7uh uBz8ilVoZ+qox3wIj7O5BoIx2dVFANxJyMKsbmOgujxr7qbyPjwNkhoQXR1dxF7XQyOI 6nyClPAtdkhrZJeZqhgKwh9Ci9HeOEWElLIDYhvhu8ASoekgxEK3W8Q9GzCv89tn4GLP 2SAsqCaPtJuF3UDYKHOC/AEZ2umC+dAkXlzJtHQ+CSy0i+K5rfDMt20r0EBsjiuyOxOP ynFtM18IwvFWBB09AZfajlfkGer94L0Da7J0UMnNPb6gU5MhKM1/TktxqAEW3YwXBz9K yG9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5BI4Lx12AwI6l9ha8+/bu3bisKYYHn2V9oD2R3uPz68=; b=NZU2PGK+2a1rvbtU/h1g+hGKzaBfEh65BW2CGTF4QGAzigTbqI1D61hFsWKN5MfYOD C5TrjSKx3FKFtNvATOS3OLwUsvr4GsoRJhYEnKis3toy7yGkS+7hJDgYCQIkEz1iQQL+ XnHyYtKbrIq8mjqug0McEfNXbNgykiIn0wlawGPvGFQhhIlVmIkDPjFtdYHdJJCLiN3X wJQKEekvKcvhL/GfTVnUkKqYEGrHo7H/oT7M7Pvdozr2g1fazgF7GYUULxhuxqhPaS14 t9YzeRNMOmcwS44vrxeHxt0CqfPdQjTCaWWLWZ475ZJSlB7sOBOTG6rY0/8Mn8+xF85d oo5g== X-Gm-Message-State: AOAM531i6ioVlB3j0OUiR9o4clQon9nG7VTiZT5wT02FPmtZykEKp3K5 p1zUov6qFOTjg1955Dsx3nA5ev9jxWuLCICn0URvzzVq83jCljYp/G+RFn6etiZN3fX0PTuwnKm zGEwYeyiYGXQZ/SBK/+Mjtj1stkHjBjM50WYamu1fiKeN+KZ/v+noMHh5uq5h5phG10Py X-Google-Smtp-Source: ABdhPJxUFMV2xplFnm0+Cp6T+gh0fPfqmXTzOr5BuJ1kbH+mSIndBJEbfjveejgKv3SORsqlR0Cufg== X-Received: by 2002:a17:907:2da1:: with SMTP id gt33mr9521546ejc.378.1636639914652; Thu, 11 Nov 2021 06:11:54 -0800 (PST) From: Jamie Iles To: qemu-devel@nongnu.org Subject: [PATCH 1/2] hw/core/loader: return image sizes as ssize_t Date: Thu, 11 Nov 2021 14:11:40 +0000 Message-Id: <20211111141141.3295094-2-jamie@nuviainc.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211111141141.3295094-1-jamie@nuviainc.com> References: <20211111141141.3295094-1-jamie@nuviainc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::531 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::531; envelope-from=jamie@nuviainc.com; helo=mail-ed1-x531.google.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jamie Iles , lmichel@kalray.eu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1636640081663100001 Content-Type: text/plain; charset="utf-8" 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 Signed-off-by: Jamie Iles Reviewed-by: Alistair Francis Reviewed-by: Luc Michel Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/armv7m.c | 2 +- hw/arm/boot.c | 8 ++-- hw/core/generic-loader.c | 2 +- hw/core/loader.c | 81 +++++++++++++++++++++------------------- hw/i386/x86.c | 2 +- hw/riscv/boot.c | 5 ++- include/hw/loader.h | 55 +++++++++++++-------------- 7 files changed, 80 insertions(+), 75 deletions(-) diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c index 8d08db80be83..a6393dce7276 100644 --- a/hw/arm/armv7m.c +++ b/hw/arm/armv7m.c @@ -552,7 +552,7 @@ static void armv7m_reset(void *opaque) =20 void armv7m_load_kernel(ARMCPU *cpu, const char *kernel_filename, int mem_= size) { - int image_size; + ssize_t image_size; uint64_t entry; int big_endian; AddressSpace *as; diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 74ad397b1ff9..3853203438ba 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -876,7 +876,7 @@ static int do_arm_linux_init(Object *obj, void *opaque) return 0; } =20 -static int64_t arm_load_elf(struct arm_boot_info *info, uint64_t *pentry, +static ssize_t arm_load_elf(struct arm_boot_info *info, uint64_t *pentry, uint64_t *lowaddr, uint64_t *highaddr, int elf_machine, AddressSpace *as) { @@ -887,7 +887,7 @@ static int64_t arm_load_elf(struct arm_boot_info *info,= uint64_t *pentry, } elf_header; int data_swab =3D 0; bool big_endian; - int64_t ret =3D -1; + ssize_t ret =3D -1; Error *err =3D NULL; =20 =20 @@ -1009,7 +1009,7 @@ static void arm_setup_direct_kernel_boot(ARMCPU *cpu, /* Set up for a direct boot of a kernel image file. */ CPUState *cs; AddressSpace *as =3D arm_boot_address_space(cpu, info); - int kernel_size; + ssize_t kernel_size; int initrd_size; int is_linux =3D 0; uint64_t elf_entry; @@ -1098,7 +1098,7 @@ static void arm_setup_direct_kernel_boot(ARMCPU *cpu, =20 if (kernel_size > info->ram_size) { error_report("kernel '%s' is too large to fit in RAM " - "(kernel size %d, RAM size %" PRId64 ")", + "(kernel size %zd, RAM size %" PRId64 ")", info->kernel_filename, kernel_size, info->ram_size); exit(1); } diff --git a/hw/core/generic-loader.c b/hw/core/generic-loader.c index d14f932eea2e..bc1451da8f55 100644 --- a/hw/core/generic-loader.c +++ b/hw/core/generic-loader.c @@ -66,7 +66,7 @@ static void generic_loader_realize(DeviceState *dev, Erro= r **errp) GenericLoaderState *s =3D GENERIC_LOADER(dev); hwaddr entry; int big_endian; - int size =3D 0; + ssize_t size =3D 0; =20 s->set_pc =3D false; =20 diff --git a/hw/core/loader.c b/hw/core/loader.c index 052a0fd7198b..348bbf535bd9 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -115,17 +115,17 @@ ssize_t read_targphys(const char *name, return did; } =20 -int load_image_targphys(const char *filename, - hwaddr addr, uint64_t max_sz) +ssize_t load_image_targphys(const char *filename, + hwaddr addr, uint64_t max_sz) { return load_image_targphys_as(filename, addr, max_sz, NULL); } =20 /* return the size or -1 if error */ -int load_image_targphys_as(const char *filename, - hwaddr addr, uint64_t max_sz, AddressSpace *as) +ssize_t load_image_targphys_as(const char *filename, + hwaddr addr, uint64_t max_sz, AddressSpace = *as) { - int size; + ssize_t size; =20 size =3D get_image_size(filename); if (size < 0 || size > max_sz) { @@ -139,9 +139,9 @@ int load_image_targphys_as(const char *filename, return size; } =20 -int load_image_mr(const char *filename, MemoryRegion *mr) +ssize_t load_image_mr(const char *filename, MemoryRegion *mr) { - int size; + ssize_t size; =20 if (!memory_access_is_direct(mr, false)) { /* Can only load an image into RAM or ROM */ @@ -223,8 +223,8 @@ static void bswap_ahdr(struct exec *e) : (_N_SEGMENT_ROUND (_N_TXTENDADDR(x, target_page_size), target_page_= size))) =20 =20 -int load_aout(const char *filename, hwaddr addr, int max_sz, - int bswap_needed, hwaddr target_page_size) +ssize_t load_aout(const char *filename, hwaddr addr, int max_sz, + int bswap_needed, hwaddr target_page_size) { int fd; ssize_t size, ret; @@ -618,13 +618,14 @@ toosmall: } =20 /* Load a U-Boot image. */ -static int load_uboot_image(const char *filename, hwaddr *ep, hwaddr *load= addr, - int *is_linux, uint8_t image_type, - uint64_t (*translate_fn)(void *, uint64_t), - void *translate_opaque, AddressSpace *as) +static ssize_t load_uboot_image(const char *filename, hwaddr *ep, + hwaddr *loadaddr, int *is_linux, + uint8_t image_type, + uint64_t (*translate_fn)(void *, uint64_t), + void *translate_opaque, AddressSpace *as) { int fd; - int size; + ssize_t size; hwaddr address; uboot_image_header_t h; uboot_image_header_t *hdr =3D &h; @@ -746,40 +747,40 @@ out: return ret; } =20 -int load_uimage(const char *filename, hwaddr *ep, hwaddr *loadaddr, - int *is_linux, - uint64_t (*translate_fn)(void *, uint64_t), - void *translate_opaque) +ssize_t load_uimage(const char *filename, hwaddr *ep, hwaddr *loadaddr, + int *is_linux, + uint64_t (*translate_fn)(void *, uint64_t), + void *translate_opaque) { return load_uboot_image(filename, ep, loadaddr, is_linux, IH_TYPE_KERN= EL, translate_fn, translate_opaque, NULL); } =20 -int load_uimage_as(const char *filename, hwaddr *ep, hwaddr *loadaddr, - int *is_linux, - uint64_t (*translate_fn)(void *, uint64_t), - void *translate_opaque, AddressSpace *as) +ssize_t load_uimage_as(const char *filename, hwaddr *ep, hwaddr *loadaddr, + int *is_linux, + uint64_t (*translate_fn)(void *, uint64_t), + void *translate_opaque, AddressSpace *as) { return load_uboot_image(filename, ep, loadaddr, is_linux, IH_TYPE_KERN= EL, translate_fn, translate_opaque, as); } =20 /* Load a ramdisk. */ -int load_ramdisk(const char *filename, hwaddr addr, uint64_t max_sz) +ssize_t load_ramdisk(const char *filename, hwaddr addr, uint64_t max_sz) { return load_ramdisk_as(filename, addr, max_sz, NULL); } =20 -int load_ramdisk_as(const char *filename, hwaddr addr, uint64_t max_sz, - AddressSpace *as) +ssize_t load_ramdisk_as(const char *filename, hwaddr addr, uint64_t max_sz, + AddressSpace *as) { return load_uboot_image(filename, NULL, &addr, NULL, IH_TYPE_RAMDISK, NULL, NULL, as); } =20 /* Load a gzip-compressed kernel to a dynamically allocated buffer. */ -int load_image_gzipped_buffer(const char *filename, uint64_t max_sz, - uint8_t **buffer) +ssize_t load_image_gzipped_buffer(const char *filename, uint64_t max_sz, + uint8_t **buffer) { uint8_t *compressed_data =3D NULL; uint8_t *data =3D NULL; @@ -824,9 +825,9 @@ int load_image_gzipped_buffer(const char *filename, uin= t64_t max_sz, } =20 /* Load a gzip-compressed kernel. */ -int load_image_gzipped(const char *filename, hwaddr addr, uint64_t max_sz) +ssize_t load_image_gzipped(const char *filename, hwaddr addr, uint64_t max= _sz) { - int bytes; + ssize_t bytes; uint8_t *data; =20 bytes =3D load_image_gzipped_buffer(filename, max_sz, &data); @@ -956,14 +957,15 @@ static void *rom_set_mr(Rom *rom, Object *owner, cons= t char *name, bool ro) return data; } =20 -int rom_add_file(const char *file, const char *fw_dir, - hwaddr addr, int32_t bootindex, - bool option_rom, MemoryRegion *mr, - AddressSpace *as) +ssize_t rom_add_file(const char *file, const char *fw_dir, + hwaddr addr, int32_t bootindex, + bool option_rom, MemoryRegion *mr, + AddressSpace *as) { MachineClass *mc =3D MACHINE_GET_CLASS(qdev_get_machine()); Rom *rom; - int rc, fd =3D -1; + ssize_t rc; + int fd =3D -1; char devpath[100]; =20 if (as && mr) { @@ -1005,7 +1007,7 @@ int rom_add_file(const char *file, const char *fw_dir, lseek(fd, 0, SEEK_SET); rc =3D read(fd, rom->data, rom->datasize); if (rc !=3D rom->datasize) { - fprintf(stderr, "rom: file %-20s: read error: rc=3D%d (expected %z= d)\n", + fprintf(stderr, "rom: file %-20s: read error: rc=3D%zd (expected %= zd)\n", rom->name, rc, rom->datasize); goto err; } @@ -1124,12 +1126,12 @@ int rom_add_elf_program(const char *name, GMappedFi= le *mapped_file, void *data, return 0; } =20 -int rom_add_vga(const char *file) +ssize_t rom_add_vga(const char *file) { return rom_add_file(file, "vgaroms", 0, -1, true, NULL, NULL); } =20 -int rom_add_option(const char *file, int32_t bootindex) +ssize_t rom_add_option(const char *file, int32_t bootindex) { return rom_add_file(file, "genroms", 0, bootindex, true, NULL, NULL); } @@ -1742,11 +1744,12 @@ out: } =20 /* return size or -1 if error */ -int load_targphys_hex_as(const char *filename, hwaddr *entry, AddressSpace= *as) +ssize_t load_targphys_hex_as(const char *filename, hwaddr *entry, + AddressSpace *as) { gsize hex_blob_size; gchar *hex_blob; - int total_size =3D 0; + ssize_t total_size =3D 0; =20 if (!g_file_get_contents(filename, &hex_blob, &hex_blob_size, NULL)) { return -1; diff --git a/hw/i386/x86.c b/hw/i386/x86.c index b84840a1bb99..1edf7ac53dfd 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -1113,7 +1113,7 @@ void x86_bios_rom_init(MachineState *ms, const char *= default_firmware, char *filename; MemoryRegion *bios, *isa_bios; int bios_size, isa_bios_size; - int ret; + ssize_t ret; =20 /* BIOS load */ bios_name =3D ms->firmware ?: default_firmware; diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c index 519fa455a154..7d221db051bf 100644 --- a/hw/riscv/boot.c +++ b/hw/riscv/boot.c @@ -127,7 +127,8 @@ target_ulong riscv_load_firmware(const char *firmware_f= ilename, 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; =20 if (load_elf_ram_sym(firmware_filename, NULL, NULL, NULL, &firmware_entry, NULL, &firmware_end, NULL, @@ -176,7 +177,7 @@ target_ulong riscv_load_kernel(const char *kernel_filen= ame, hwaddr riscv_load_initrd(const char *filename, uint64_t mem_size, uint64_t kernel_entry, hwaddr *start) { - int size; + ssize_t size; =20 /* * We want to put the initrd far enough into RAM that when the diff --git a/include/hw/loader.h b/include/hw/loader.h index 4fa485bd61c7..a5e2925040c0 100644 --- a/include/hw/loader.h +++ b/include/hw/loader.h @@ -40,8 +40,8 @@ ssize_t load_image_size(const char *filename, void *addr,= size_t size); * * Returns the size of the loaded image on success, -1 otherwise. */ -int load_image_targphys_as(const char *filename, - hwaddr addr, uint64_t max_sz, AddressSpace *as); +ssize_t load_image_targphys_as(const char *filename, + hwaddr addr, uint64_t max_sz, AddressSpace = *as); =20 /**load_targphys_hex_as: * @filename: Path to the .hex file @@ -53,14 +53,15 @@ int load_image_targphys_as(const char *filename, * * Returns the size of the loaded .hex file on success, -1 otherwise. */ -int load_targphys_hex_as(const char *filename, hwaddr *entry, AddressSpace= *as); +ssize_t load_targphys_hex_as(const char *filename, hwaddr *entry, + AddressSpace *as); =20 /** load_image_targphys: * Same as load_image_targphys_as(), but doesn't allow the caller to speci= fy * an AddressSpace. */ -int load_image_targphys(const char *filename, hwaddr, - uint64_t max_sz); +ssize_t load_image_targphys(const char *filename, hwaddr, + uint64_t max_sz); =20 /** * load_image_mr: load an image into a memory region @@ -73,7 +74,7 @@ int load_image_targphys(const char *filename, hwaddr, * If the file is larger than the memory region's size the call will fail. * Returns -1 on failure, or the size of the file. */ -int load_image_mr(const char *filename, MemoryRegion *mr); +ssize_t load_image_mr(const char *filename, MemoryRegion *mr); =20 /* This is the limit on the maximum uncompressed image size that * load_image_gzipped_buffer() and load_image_gzipped() will read. It prev= ents @@ -81,9 +82,9 @@ int load_image_mr(const char *filename, MemoryRegion *mr); */ #define LOAD_IMAGE_MAX_GUNZIP_BYTES (256 << 20) =20 -int load_image_gzipped_buffer(const char *filename, uint64_t max_sz, - uint8_t **buffer); -int load_image_gzipped(const char *filename, hwaddr addr, uint64_t max_sz); +ssize_t load_image_gzipped_buffer(const char *filename, uint64_t max_sz, + uint8_t **buffer); +ssize_t load_image_gzipped(const char *filename, hwaddr addr, uint64_t max= _sz); =20 #define ELF_LOAD_FAILED -1 #define ELF_LOAD_NOT_ELF -2 @@ -183,8 +184,8 @@ ssize_t load_elf(const char *filename, */ void load_elf_hdr(const char *filename, void *hdr, bool *is64, Error **err= p); =20 -int load_aout(const char *filename, hwaddr addr, int max_sz, - int bswap_needed, hwaddr target_page_size); +ssize_t load_aout(const char *filename, hwaddr addr, int max_sz, + int bswap_needed, hwaddr target_page_size); =20 #define LOAD_UIMAGE_LOADADDR_INVALID (-1) =20 @@ -205,19 +206,19 @@ int load_aout(const char *filename, hwaddr addr, int = max_sz, * * Returns the size of the loaded image on success, -1 otherwise. */ -int load_uimage_as(const char *filename, hwaddr *ep, - hwaddr *loadaddr, int *is_linux, - uint64_t (*translate_fn)(void *, uint64_t), - void *translate_opaque, AddressSpace *as); +ssize_t load_uimage_as(const char *filename, hwaddr *ep, + hwaddr *loadaddr, int *is_linux, + uint64_t (*translate_fn)(void *, uint64_t), + void *translate_opaque, AddressSpace *as); =20 /** load_uimage: * Same as load_uimage_as(), but doesn't allow the caller to specify an * AddressSpace. */ -int load_uimage(const char *filename, hwaddr *ep, - hwaddr *loadaddr, int *is_linux, - uint64_t (*translate_fn)(void *, uint64_t), - void *translate_opaque); +ssize_t load_uimage(const char *filename, hwaddr *ep, + hwaddr *loadaddr, int *is_linux, + uint64_t (*translate_fn)(void *, uint64_t), + void *translate_opaque); =20 /** * load_ramdisk_as: @@ -232,15 +233,15 @@ int load_uimage(const char *filename, hwaddr *ep, * * Returns the size of the loaded image on success, -1 otherwise. */ -int load_ramdisk_as(const char *filename, hwaddr addr, uint64_t max_sz, - AddressSpace *as); +ssize_t load_ramdisk_as(const char *filename, hwaddr addr, uint64_t max_sz, + AddressSpace *as); =20 /** * load_ramdisk: * Same as load_ramdisk_as(), but doesn't allow the caller to specify * an AddressSpace. */ -int load_ramdisk(const char *filename, hwaddr addr, uint64_t max_sz); +ssize_t load_ramdisk(const char *filename, hwaddr addr, uint64_t max_sz); =20 ssize_t gunzip(void *dst, size_t dstlen, uint8_t *src, size_t srclen); =20 @@ -253,9 +254,9 @@ void pstrcpy_targphys(const char *name, extern bool option_rom_has_mr; extern bool rom_file_has_mr; =20 -int rom_add_file(const char *file, const char *fw_dir, - hwaddr addr, int32_t bootindex, - bool option_rom, MemoryRegion *mr, AddressSpace *as); +ssize_t rom_add_file(const char *file, const char *fw_dir, + hwaddr addr, int32_t bootindex, + bool option_rom, MemoryRegion *mr, AddressSpace *as); MemoryRegion *rom_add_blob(const char *name, const void *blob, size_t len, size_t max_len, hwaddr addr, const char *fw_file_name, @@ -336,8 +337,8 @@ void hmp_info_roms(Monitor *mon, const QDict *qdict); #define rom_add_blob_fixed_as(_f, _b, _l, _a, _as) \ rom_add_blob(_f, _b, _l, _l, _a, NULL, NULL, NULL, _as, true) =20 -int rom_add_vga(const char *file); -int rom_add_option(const char *file, int32_t bootindex); +ssize_t rom_add_vga(const char *file); +ssize_t rom_add_option(const char *file, int32_t bootindex); =20 /* This is the usual maximum in uboot, so if a uImage overflows this, it w= ould * overflow on real hardware too. */ --=20 2.30.2 From nobody Mon Feb 9 08:05:16 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1636640403477786.3597389519363; Thu, 11 Nov 2021 06:20:03 -0800 (PST) Received: from localhost ([::1]:49436 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mlAvq-0005aB-3b for importer@patchew.org; Thu, 11 Nov 2021 09:20:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mlAoE-00053t-1l for qemu-devel@nongnu.org; Thu, 11 Nov 2021 09:12:10 -0500 Received: from [2a00:1450:4864:20::532] (port=46832 helo=mail-ed1-x532.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mlAoC-00067U-6i for qemu-devel@nongnu.org; Thu, 11 Nov 2021 09:12:09 -0500 Received: by mail-ed1-x532.google.com with SMTP id c8so24364973ede.13 for ; Thu, 11 Nov 2021 06:11:58 -0800 (PST) Received: from localhost ([82.44.17.50]) by smtp.gmail.com with ESMTPSA id ga1sm1424340ejc.40.2021.11.11.06.11.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Nov 2021 06:11:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=slgv2b5Jtj2Nb7T7MW1x3Gbgc4Xp7L48IKrc9fEpBY0=; b=zLmOdYR3DWgiye8lsb15ZLdzi9EOnDW8x37keKF+SicA8IPjxCO4fEtkY0knltghR0 5cP9HgCsgCUslRWWsnONIxIo8R492V8KJ8FWHb3VLi7lLOcY0d7IQZc+IfgHa9+wKeo0 rjAZDjPlK38ariIgY7Jd9DOrgWG9gDAOqDQlkv4Fjx+U6QnDOrohZwXg84HNOJN7Lg/m HVTEEpD5tH4JaH06uztZa0V0kmfNa/hoOQlMjrxWrNw/RC2HTTcvosup344ICI/Zcko0 FCK6pHU9CYMxLcs1f34+k8D5F3mWKuw+cvqm4QrRl1ZR2BFhyhlxE8R01QsLE1e9/VUt gF7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=slgv2b5Jtj2Nb7T7MW1x3Gbgc4Xp7L48IKrc9fEpBY0=; b=k5TQPhOGhHvIYmSagD42CgMWcxYHPZZrTjdP2CyWxh0meQgvWC79FfMSYBZgn356AU d1a0lSyGpBkrmhAwkYutYlL69LoogCyyGMnbdqEfk0Ds8ST3hmdZJxfvs4gAX+eYJFxF IWpXdYSxcM0EP5md9w3uo2xwgVWPyuOUKpp8qLsnfNqrw7ZzhfLFNpkZruXOvYvlSf4T 1QbbUMHIlqVSJjkg3e9e4f/0eGaAYVwYR/g6jiXzyt/DXC7Y4KPP5zDZ8yKY7Mu7eozj rM8LZLUKqXv3ETLMMekpv+WmHTNhpSpOg86lk3bHPZnr5QyhMxbMZ8cQsDbFZ4Chc+08 5AwA== X-Gm-Message-State: AOAM5302Mr5OhON/ZVAeMR7YimqGg/ckYnlubhpu9Xiez9Rf2UGLX/ER cV6kidkqukinZ37gAVtYx8kHMcfvteCZSfvYDTlnM9MnqSBbIAeFf0RZJSVnUksaNwf7zaUhIDO 6/mJ+abWJLIBtOokB68Yy32SAYoB5buxQxewnrponVKtdXZ3hlIyO1Q51R/kxBxV3oA91 X-Google-Smtp-Source: ABdhPJz2gqtA22HIdR0ed79HUnj2DHulGa/h0CM9g3aoM8Pq+PhCaXRKJGU7GM9HZPOisG4m+Kk6Xw== X-Received: by 2002:a05:6402:447:: with SMTP id p7mr10106096edw.261.1636639916510; Thu, 11 Nov 2021 06:11:56 -0800 (PST) From: Jamie Iles To: qemu-devel@nongnu.org Subject: [PATCH 2/2] hw/core/loader: workaround read() size limit. Date: Thu, 11 Nov 2021 14:11:41 +0000 Message-Id: <20211111141141.3295094-3-jamie@nuviainc.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211111141141.3295094-1-jamie@nuviainc.com> References: <20211111141141.3295094-1-jamie@nuviainc.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::532 (failed) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::532; envelope-from=jamie@nuviainc.com; helo=mail-ed1-x532.google.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jamie Iles , lmichel@kalray.eu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1636640405423100001 Content-Type: text/plain; charset="utf-8" On Linux, read() will only ever read a maximum of 0x7ffff000 bytes regardless of what is asked. If the file is larger than 0x7ffff000 bytes the read will need to be broken up into multiple chunks. Cc: Luc Michel Signed-off-by: Jamie Iles --- hw/core/loader.c | 40 ++++++++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/hw/core/loader.c b/hw/core/loader.c index 348bbf535bd9..16ca9b99cf0f 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -80,6 +80,34 @@ int64_t get_image_size(const char *filename) return size; } =20 +static ssize_t read_large(int fd, void *dst, size_t len) +{ + /* + * man 2 read says: + * + * On Linux, read() (and similar system calls) will transfer at most + * 0x7ffff000 (2,147,479,552) bytes, returning the number of bytes + * actually transferred. (This is true on both 32-bit and 64-bit + * systems.) + * + * So read in chunks no larger than 0x7ffff000 bytes. + */ + size_t max_chunk_size =3D 0x7ffff000; + size_t offset =3D 0; + + while (offset < len) { + size_t chunk_len =3D MIN(max_chunk_size, len - offset); + ssize_t br =3D read(fd, dst + offset, chunk_len); + + if (br < 0) { + return br; + } + offset +=3D br; + } + + return (ssize_t)len; +} + /* return the size or -1 if error */ ssize_t load_image_size(const char *filename, void *addr, size_t size) { @@ -91,7 +119,7 @@ ssize_t load_image_size(const char *filename, void *addr= , size_t size) return -1; } =20 - while ((actsize =3D read(fd, addr + l, size - l)) > 0) { + while ((actsize =3D read_large(fd, addr + l, size - l)) > 0) { l +=3D actsize; } =20 @@ -108,7 +136,7 @@ ssize_t read_targphys(const char *name, ssize_t did; =20 buf =3D g_malloc(nbytes); - did =3D read(fd, buf, nbytes); + did =3D read_large(fd, buf, nbytes); if (did > 0) rom_add_blob_fixed("read", buf, did, dst_addr); g_free(buf); @@ -235,7 +263,7 @@ ssize_t load_aout(const char *filename, hwaddr addr, in= t max_sz, if (fd < 0) return -1; =20 - size =3D read(fd, &e, sizeof(e)); + size =3D read_large(fd, &e, sizeof(e)); if (size < 0) goto fail; =20 @@ -286,7 +314,7 @@ static void *load_at(int fd, off_t offset, size_t size) if (lseek(fd, offset, SEEK_SET) < 0) return NULL; ptr =3D g_malloc(size); - if (read(fd, ptr, size) !=3D size) { + if (read_large(fd, ptr, size) !=3D size) { g_free(ptr); return NULL; } @@ -714,7 +742,7 @@ static ssize_t load_uboot_image(const char *filename, h= waddr *ep, =20 data =3D g_malloc(hdr->ih_size); =20 - if (read(fd, data, hdr->ih_size) !=3D hdr->ih_size) { + if (read_large(fd, data, hdr->ih_size) !=3D hdr->ih_size) { fprintf(stderr, "Error reading file\n"); goto out; } @@ -1005,7 +1033,7 @@ ssize_t rom_add_file(const char *file, const char *fw= _dir, rom->datasize =3D rom->romsize; rom->data =3D g_malloc0(rom->datasize); lseek(fd, 0, SEEK_SET); - rc =3D read(fd, rom->data, rom->datasize); + rc =3D read_large(fd, rom->data, rom->datasize); if (rc !=3D rom->datasize) { fprintf(stderr, "rom: file %-20s: read error: rc=3D%zd (expected %= zd)\n", rom->name, rc, rom->datasize); --=20 2.30.2