From f62226f7dc445341ec86438638bb0b0f8d4e21ee Mon Sep 17 00:00:00 2001 From: Vishal Chourasia Date: Fri, 24 Oct 2025 18:35:57 +0530 Subject: [PATCH] hw/core/loader: improve error handling in image loading functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add error checking for lseek() failure and provide better error messages when image loading fails, including filenames and addresses. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Aditya Gupta Signed-off-by: Vishal Chourasia Message-ID: <20251024130556.1942835-8-vishalc@linux.ibm.com> Signed-off-by: Philippe Mathieu-Daudé --- hw/core/loader.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/hw/core/loader.c b/hw/core/loader.c index 7aca4989ef..d7c11c18f1 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -79,6 +79,10 @@ int64_t get_image_size(const char *filename, Error **errp) if (fd < 0) return -1; size = lseek(fd, 0, SEEK_END); + if (size < 0) { + error_setg_errno(errp, errno, "lseek failure: %s", filename); + return -1; + } close(fd); return size; } @@ -132,11 +136,20 @@ ssize_t load_image_targphys_as(const char *filename, ssize_t size; size = get_image_size(filename, errp); - if (size < 0 || size > max_sz) { + if (size < 0) { return -1; } + + if (size > max_sz) { + error_setg(errp, "%s exceeds maximum image size (%s)", + filename, size_to_str(max_sz)); + return -1; + } + if (size > 0) { if (rom_add_file_fixed_as(filename, addr, -1, as) < 0) { + error_setg(errp, "could not load '%s' at %" HWADDR_PRIx, + filename, addr); return -1; } }