From nobody Wed Apr 8 03:09:00 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1773167538; cv=none; d=zohomail.com; s=zohoarc; b=OgMYjLOnvONScVCDjE/cA3lF4lljHnp49johQXDzLQOa12rfU5nhF0UaBSDHOqsAZZFJGS1m4jJU/clcp2Se8h88UwJ7ZeR1EXdMJNzWwigY7r50c+YzfvIi24PLuiMhsMiFZCV1TmKIGnCKRElXDPGiZKCAGVcRzYp25fVnLzQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773167538; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=GG2Gexo+Btb5AB7rJ+bn7lp3VSbZ/BJr46AUU3D8uIU=; b=g5q9JOfgip9+fQgAUJo/XTmOz8zRLI15oGwY3YQkpXOeWAK0gFmMbnotaqfOOavHwQaerZCPGb+7wxN9Cf6bwi52fQylpuPn1iDsFjVHGRocWXqEly+lObA/WGHWmyuVvYCm/krhT2U7cRMkEB41vaXyMD8p8TcKz+DuKZSGsDA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773167538137316.8040694162429; Tue, 10 Mar 2026 11:32:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w01s8-000220-6n; Tue, 10 Mar 2026 14:32:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w01s5-00021Y-Ft for qemu-devel@nongnu.org; Tue, 10 Mar 2026 14:31:57 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w01s2-0007gI-Fp for qemu-devel@nongnu.org; Tue, 10 Mar 2026 14:31:57 -0400 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-2ae8177446fso33555605ad.0 for ; Tue, 10 Mar 2026 11:31:54 -0700 (PDT) Received: from localhost.localdomain ([123.19.166.13]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ae840b2e9dsm209437015ad.85.2026.03.10.11.31.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 11:31:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773167513; x=1773772313; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GG2Gexo+Btb5AB7rJ+bn7lp3VSbZ/BJr46AUU3D8uIU=; b=nqN4272mUYb9QeSWer6KfEFiUaCpVijtzcStlt6oySs275kEQvb+rlzeVY1G66MUV5 lm46Yg50/no3U+hzrrwGM7y+EvcAXmkveQUStKK2lghFEUpdJ7VivshhTOG9KxNqGn0n A1ghWdFf3C30qvfvZRbzm/bod407+ky2PuFpUGhk80Qb/QPHjCj61CFNCHVGwZbi+P3b 08KVXcc/ZA4LykVVnERmFrqUWRE7Wsnpv21TSxeRT8IS6XiiTcMmBUM5Tom58AtKVFYN DI11R5JRB+IBef/1wLVm1CxxeUHtxJUGtkEWkHPD/h8C8BxBgI1m+thNnp1ukV/JfNOi 9Tog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773167513; x=1773772313; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=GG2Gexo+Btb5AB7rJ+bn7lp3VSbZ/BJr46AUU3D8uIU=; b=cVK719yHfmBx+PoKf+N8h0t/oJN90RdlXThBraQOuaM3v1807K//JDXwB4Pe/jZkFu QeloEBFhpJaGIRFMNAeTALTYJH0HHvFk1uSQDW3P3H1IHzfP6S+ZMecpCquWNysepFsB 9IMY3WojsGAxjLGZhNLpjLrZn5dBd8IpmpXhW5upzbSKnhXoMXBqPTm6q0OYcpEPiXFf PjIB0LkOYompP377INCoNZmSzObB20P8EA4sntImM1uhHjKo+lYe54xM8NtVSWfIE9Ho oQ7aMXltKH8MSSKOh/dnQqwpRaau5tVhHGQZ6wVfp3MPPDOalNz1HbpAOfb46OEpHJ8T 9VFQ== X-Gm-Message-State: AOJu0Yw7Ey1WCPQMBnOF4BNISfkDl/dWTDgQkpCiDY4I15vYX9kCVmFW eEZfjQ9WTCgN+QjHNx/4JCu6dU7XS79sRosM6K2POFTL05xGLdN94eB9m9Fo2O0JmSrnjA== X-Gm-Gg: ATEYQzyFjj3vncaxx2EgbkjIIrJmEX2u1e6AhDTCuLjE2+FmE1m7qhwJof4d8kRx3UI bO1cq8hbh4mzMCSey3iiD9aZvrt7jMu+eSTmqlPeRWNd1j/6IZ+po0SN+175Fplg7YM0BETpnjX PMf1zAIVK72tBwMnQ0SzzK7iU9X5OHiEvfCQkxkIOlKItcvmUjjD058PzvJVjRTcTnsI6hTPQVP 3/YfsSGiMo1gpP/ryvi4eQ34gsBjw5f9qrxsOE9em+zAolz1SmoOV5ggtOr0YlAF5BoBy6gZ/3s RZAmnoXE/qmyGIZrcbXeJRj8HNWluZHuGCkHgdu/1o4RnPJKrf1HKYNQ15wYJe3+N8Qy0m36pC3 JkD18F4nwIRHqMHIjUzYmEfeC8gkEJZlHOknM+MtumJs1Zlk5pv2/ysGOW37nUs/8bHkg9tyqMS N3VycKi/fFRT9uVRLSfcaAGnLy1eRtEpzu79o1nXO3Lu130A== X-Received: by 2002:a17:902:d48b:b0:2a9:5e25:46f6 with SMTP id d9443c01a7336-2ae82442c8dmr151595215ad.17.1773167512772; Tue, 10 Mar 2026 11:31:52 -0700 (PDT) From: Trieu Huynh X-Google-Original-From: Trieu Huynh To: qemu-devel@nongnu.org Cc: Trieu Huynh , Richard Henderson , Helge Deller , Thomas Huth , Laurent Vivier , "Edgar E. Iglesias" , BALATON Zoltan , Bernhard Beschow , Mark Cave-Ayland , Nicholas Piggin , Aditya Gupta , Glenn Miles , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Harsh Prateek Bora , qemu-ppc@nongnu.org Subject: [PATCH 1/4] hw/core/loader: fix error handling for load_image_targphys callers Date: Wed, 11 Mar 2026 01:27:57 +0700 Message-ID: <20260310182801.196443-2-viking4@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260310182801.196443-1-viking4@gmail.com> References: <20260310182801.196443-1-viking4@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2607:f8b0:4864:20::635; envelope-from=vikingtc4@gmail.com; helo=mail-pl1-x635.google.com X-Spam_score_int: 15 X-Spam_score: 1.5 X-Spam_bar: + X-Spam_report: (1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1773167540930158500 Content-Type: text/plain; charset="utf-8" From: Trieu Huynh Check return value of load_image_targphys() and return early on failure instead of continuing with invalid state. - Use ret < 0 to handle negative return value. - No functional changes. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/413 Signed-off-by: Trieu Huynh --- hw/alpha/dp264.c | 8 ++++++-- hw/hppa/machine.c | 7 +++++-- hw/m68k/next-cube.c | 9 ++++++++- hw/m68k/q800.c | 7 +++++-- hw/m68k/virt.c | 7 +++++-- hw/microblaze/boot.c | 4 ++++ hw/ppc/amigaone.c | 9 +++++++++ hw/ppc/e500.c | 10 ++++++++++ hw/ppc/mac_newworld.c | 10 ++++++++++ hw/ppc/mac_oldworld.c | 10 ++++++++++ hw/ppc/pegasos.c | 5 +++++ hw/ppc/pnv.c | 20 ++++++++++++++++---- hw/ppc/ppc440_bamboo.c | 4 ++++ hw/ppc/prep.c | 10 ++++++++++ hw/ppc/sam460ex.c | 5 +++++ hw/ppc/spapr.c | 8 ++++++++ hw/ppc/virtex_ml507.c | 9 +++++++++ 17 files changed, 129 insertions(+), 13 deletions(-) diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index 98219f0456..830d14a509 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -189,8 +189,12 @@ static void clipper_init(MachineState *machine) =20 /* Put the initrd image as high in memory as possible. */ initrd_base =3D (ram_size - initrd_size) & TARGET_PAGE_MASK; - load_image_targphys(initrd_filename, initrd_base, - ram_size - initrd_base, NULL); + if (load_image_targphys(initrd_filename, initrd_base, + ram_size - initrd_base, NULL) < 0) { + error_report("could not load initrd '%s'", + initrd_filename); + exit(1); + } =20 address_space_stq_le(&address_space_memory, param_offset + 0x1= 00, initrd_base + 0xfffffc0000000000ULL, diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index f55e84529f..0bf3bccb07 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -507,8 +507,11 @@ static void machine_HP_common_init_tail(MachineState *= machine, PCIBus *pci_bus, exit(1); } =20 - load_image_targphys(initrd_filename, initrd_base, initrd_size, - NULL); + if (load_image_targphys(initrd_filename, initrd_base, initrd_s= ize, + NULL) < 0) { + error_report("Could not load initrd '%s'", initrd_filename= ); + exit(1); + } cpu[0]->env.initrd_base =3D initrd_base; cpu[0]->env.initrd_end =3D initrd_base + initrd_size; } diff --git a/hw/m68k/next-cube.c b/hw/m68k/next-cube.c index 26177c7b86..77a88d1dde 100644 --- a/hw/m68k/next-cube.c +++ b/hw/m68k/next-cube.c @@ -1326,7 +1326,14 @@ static void next_cube_init(MachineState *machine) memory_region_init_alias(&m->rom2, NULL, "next.rom2", &m->rom, 0x0, 0x20000); memory_region_add_subregion(sysmem, 0x0, &m->rom2); - if (load_image_targphys(bios_name, 0x01000000, 0x20000, NULL) < 8) { + int bios_size =3D 0; + bios_size =3D load_image_targphys(bios_name, 0x01000000, 0x20000, NULL= ); + if (bios_size < 0) { + /* Shoud report failure and exit regardless of qtest enabled or no= t */ + error_report("Failed to load firmware (bios size < 0) '%s'.", + bios_name); + exit(1); + } else if (bios_size < 8) { if (!qtest_enabled()) { error_report("Failed to load firmware '%s'.", bios_name); } diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c index ded531394e..3266617ad7 100644 --- a/hw/m68k/q800.c +++ b/hw/m68k/q800.c @@ -632,8 +632,11 @@ static void q800_machine_init(MachineState *machine) } =20 initrd_base =3D (ram_size - initrd_size) & TARGET_PAGE_MASK; - load_image_targphys(initrd_filename, initrd_base, - ram_size - initrd_base, NULL); + if (load_image_targphys(initrd_filename, initrd_base, + ram_size - initrd_base, NULL) < 0) { + error_report("Could not load initrd '%s'", initrd_filename= ); + exit(1); + } BOOTINFO2(param_ptr, BI_RAMDISK, initrd_base, initrd_size); } else { diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c index e67900c727..90f52f26e5 100644 --- a/hw/m68k/virt.c +++ b/hw/m68k/virt.c @@ -291,8 +291,11 @@ static void virt_init(MachineState *machine) } =20 initrd_base =3D (ram_size - initrd_size) & TARGET_PAGE_MASK; - load_image_targphys(initrd_filename, initrd_base, - ram_size - initrd_base, NULL); + if (load_image_targphys(initrd_filename, initrd_base, + ram_size - initrd_base, NULL) < 0) { + error_report("Could not load initrd '%s'", initrd_filename= ); + exit(1); + } BOOTINFO2(param_ptr, BI_RAMDISK, initrd_base, initrd_size); } else { diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c index a6f9ebab90..9fa8885dd3 100644 --- a/hw/microblaze/boot.c +++ b/hw/microblaze/boot.c @@ -172,6 +172,10 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, bool i= s_little_endian, if (kernel_size < 0) { kernel_size =3D load_image_targphys(kernel_filename, ddr_base, ramsize, NULL); + if (kernel_size < 0) { + error_report("could not load kernel '%s'", kernel_filename= ); + exit(EXIT_FAILURE); + } boot_info.bootstrap_pc =3D ddr_base; high =3D (ddr_base + kernel_size + 3) & ~3; } diff --git a/hw/ppc/amigaone.c b/hw/ppc/amigaone.c index 8074713fbe..bb5e712c1b 100644 --- a/hw/ppc/amigaone.c +++ b/hw/ppc/amigaone.c @@ -326,6 +326,10 @@ static void amigaone_init(MachineState *machine) exit(1); } sz =3D load_image_targphys(filename, PROM_ADDR, PROM_SIZE, &error_= fatal); + if (sz < 0) { + error_report("Could not load firmware '%s'", filename); + exit(1); + } } =20 /* Articia S */ @@ -411,6 +415,11 @@ static void amigaone_init(MachineState *machine) loadaddr =3D MAX(loadaddr, INITRD_MIN_ADDR); sz =3D load_image_targphys(machine->initrd_filename, loadaddr, bi->bd_info - loadaddr, &error_fatal); + if (sz < 0) { + error_report("Could not load initrd '%s'", + machine->initrd_filename); + exit(1); + } bi->initrd_start =3D loadaddr; bi->initrd_end =3D loadaddr + sz; } diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index d6ca2e8563..3117a05b59 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -1221,6 +1221,11 @@ void ppce500_init(MachineState *machine) kernel_size =3D load_image_targphys(machine->kernel_filename, cur_base, machine->ram_size - cur_ba= se, &error_fatal); + if (kernel_size < 0) { + error_report("Could not load kernel '%s'", + machine->kernel_filename); + exit(1); + } cur_base +=3D kernel_size; } =20 @@ -1230,6 +1235,11 @@ void ppce500_init(MachineState *machine) initrd_size =3D load_image_targphys(machine->initrd_filename, init= rd_base, machine->ram_size - initrd_base, &error_fatal); + if (initrd_size < 0) { + error_report("Could not load initrd '%s'", + machine->initrd_filename); + exit(1); + } cur_base =3D initrd_base + initrd_size; } =20 diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 3680d96ed3..5e9556af33 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -213,6 +213,11 @@ static void ppc_core99_init(MachineState *machine) kernel_base, machine->ram_size - kernel_b= ase, &error_fatal); + if (kernel_size < 0) { + error_report("Could not load kernel '%s'", + machine->kernel_filename); + exit(1); + } } /* load initrd */ if (machine->initrd_filename) { @@ -221,6 +226,11 @@ static void ppc_core99_init(MachineState *machine) initrd_base, machine->ram_size - initrd_b= ase, &error_fatal); + if (initrd_size < 0) { + error_report("Could not load initrd '%s'", + machine->initrd_filename); + exit(1); + } cmdline_base =3D TARGET_PAGE_ALIGN(initrd_base + initrd_size); } else { cmdline_base =3D TARGET_PAGE_ALIGN(kernel_base + kernel_size += KERNEL_GAP); diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index 24d9f2e3d5..fdbbfed52a 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -169,6 +169,11 @@ static void ppc_heathrow_init(MachineState *machine) kernel_base, machine->ram_size - kernel_b= ase, &error_fatal); + if (kernel_size < 0) { + error_report("Could not load kernel '%s'", + machine->kernel_filename); + exit(1); + } } /* load initrd */ if (machine->initrd_filename) { @@ -178,6 +183,11 @@ static void ppc_heathrow_init(MachineState *machine) initrd_base, machine->ram_size - initrd_b= ase, &error_fatal); + if (initrd_size < 0) { + error_report("Could not load initrd '%s'", + machine->initrd_filename); + exit(1); + } cmdline_base =3D TARGET_PAGE_ALIGN(initrd_base + initrd_size); } else { cmdline_base =3D TARGET_PAGE_ALIGN(kernel_base + kernel_size += KERNEL_GAP); diff --git a/hw/ppc/pegasos.c b/hw/ppc/pegasos.c index ac9fc5a654..0f03691f52 100644 --- a/hw/ppc/pegasos.c +++ b/hw/ppc/pegasos.c @@ -304,6 +304,11 @@ static void pegasos_init(MachineState *machine) pm->initrd_addr =3D MAX(pm->initrd_addr, INITRD_MIN_ADDR); sz =3D load_image_targphys(machine->initrd_filename, pm->initrd_ad= dr, machine->ram_size - pm->initrd_addr, &error_fa= tal); + if (sz < 0) { + error_report("Could not load initrd '%s'", + machine->initrd_filename); + exit(1); + } pm->initrd_size =3D sz; } =20 diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 1513575b8f..aecffb211b 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -1068,14 +1068,21 @@ static void pnv_init(MachineState *machine) exit(1); } =20 - load_image_targphys(fw_filename, pnv->fw_load_addr, FW_MAX_SIZE, - &error_fatal); + if (load_image_targphys(fw_filename, pnv->fw_load_addr, FW_MAX_SIZE, + &error_fatal) < 0) { + error_report("Could not load OPAL firmware '%s'", fw_filename); + exit(1); + } g_free(fw_filename); =20 /* load kernel */ if (machine->kernel_filename) { - load_image_targphys(machine->kernel_filename, - KERNEL_LOAD_ADDR, KERNEL_MAX_SIZE, &error_fata= l); + if (load_image_targphys(machine->kernel_filename, + KERNEL_LOAD_ADDR, KERNEL_MAX_SIZE, &error_fatal) <= 0) { + error_report("Could not load kernel '%s'", + machine->kernel_filename); + exit(1); + } } =20 /* load initrd */ @@ -1084,6 +1091,11 @@ static void pnv_init(MachineState *machine) pnv->initrd_size =3D load_image_targphys(machine->initrd_filename, pnv->initrd_base, INITRD_MAX_SIZE, &error_fat= al); + if (pnv->initrd_size < 0) { + error_report("Could not load initrd '%s'", + machine->initrd_filename); + exit(1); + } } =20 /* load dtb if passed */ diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c index 2dde008b0e..b9c30d8929 100644 --- a/hw/ppc/ppc440_bamboo.c +++ b/hw/ppc/ppc440_bamboo.c @@ -244,6 +244,10 @@ static void bamboo_init(MachineState *machine) initrd_size =3D load_image_targphys(initrd_filename, RAMDISK_ADDR, machine->ram_size - RAMDISK_ADDR, &error_fatal); + if (initrd_size < 0) { + error_report("Could not load initrd '%s'", initrd_filename); + exit(1); + } } =20 /* If we're loading a kernel directly, we must load the device tree to= o. */ diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index e973b34099..172a4afd71 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -382,6 +382,11 @@ static void ibm_40p_init(MachineState *machine) kernel_base, machine->ram_size - kernel_base, &error_fatal); + if (kernel_size < 0) { + error_report("Could not load kernel '%s'", + machine->kernel_filename); + exit(1); + } fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, kernel_base); fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size); /* load initrd */ @@ -391,6 +396,11 @@ static void ibm_40p_init(MachineState *machine) initrd_base, machine->ram_size - initrd_b= ase, &error_fatal); + if (initrd_size < 0) { + error_report("Could not load initrd '%s'", + machine->initrd_filename); + exit(1); + } fw_cfg_add_i32(fw_cfg, FW_CFG_INITRD_ADDR, initrd_base); fw_cfg_add_i32(fw_cfg, FW_CFG_INITRD_SIZE, initrd_size); } diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c index b13dd224ba..0747555bc8 100644 --- a/hw/ppc/sam460ex.c +++ b/hw/ppc/sam460ex.c @@ -493,6 +493,11 @@ static void sam460ex_init(MachineState *machine) RAMDISK_ADDR, machine->ram_size - RAMDISK_ADDR, &error_fatal); + if (initrd_size < 0) { + error_report("Could not load initrd '%s'", + machine->initrd_filename); + exit(1); + } } =20 /* If we're loading a kernel directly, we must load the device tree to= o. */ diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 0ab39dfea6..7ab6a47c5b 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2865,6 +2865,10 @@ static void spapr_machine_init(MachineState *machine) exit(1); } fw_size =3D load_image_targphys(filename, 0, FW_MAX_SIZE, &error_fatal= ); + if (fw_size < 0) { + error_report("Could not load LPAR firmware '%s'", filename); + exit(1); + } =20 /* * if Secure VM (PEF) support is configured, then initialize it @@ -3124,6 +3128,10 @@ static void spapr_machine_init(MachineState *machine) spapr->initrd_base, load_limit - spapr->initrd= _base, &error_fatal); + if (spapr->initrd_size < 0) { + error_report("Could not load initrd '%s'", initrd_filename= ); + exit(1); + } } } =20 diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 51b3d7d712..b125561dd6 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -255,6 +255,10 @@ static void virtex_init(MachineState *machine) kernel_size =3D load_image_targphys(kernel_filename, boot_offset, machine->ram_size, &error_fa= tal); + if (kernel_size < 0) { + error_report("could not load kernel '%s'", kernel_filename= ); + exit(1); + } boot_info.bootstrap_pc =3D boot_offset; high =3D boot_info.bootstrap_pc + kernel_size + 8192; } @@ -267,6 +271,11 @@ static void virtex_init(MachineState *machine) initrd_size =3D load_image_targphys(machine->initrd_filename, high, machine->ram_size - hi= gh, &error_fatal); + if (initrd_size < 0) { + error_report("could not load initrd '%s'", + machine->initrd_filename); + exit(1); + } high =3D ROUND_UP(high + initrd_size, 4); } =20 --=20 2.43.0 From nobody Wed Apr 8 03:09:00 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1773167572; cv=none; d=zohomail.com; s=zohoarc; b=Q7tqAHj/TXaTicd/180jZ6j0zuMgPbsRE5sJHh/jlmlWwOSL5wE6szgxLRYVXn2zvrVQEETLsAs8ztzBruNO9ZIyFLitT0cJa2xZJ+WLQNyQjnn8eD25E+FI+4IfHqKcPsPHFnJaL9uRBX9G2giXDPhefMRk4if5eACma+KYb2I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773167572; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ij/BbbSlxGP9JNf8FSJsHo5Km+Y3EWVXNZBcQXu31hs=; b=HKXQiEl8PwesqhA12i6dpMnWrP4nj3pT3NBfm6O7/eRWW48YAgzDSb56OmNWSFOTKKKy1YWzyJ687vP16mH4EJP4/gCUp18dUhC9vLf0iGXyC3oF8EGO3zE5yPVdTUEqMEvlF8BL0cRdcALZ5ofq3QwsSCJWxz/5xcYDfYfca1s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773167572310456.6619910023052; Tue, 10 Mar 2026 11:32:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w01sD-00022n-4Q; Tue, 10 Mar 2026 14:32:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w01sA-00022Q-Vi for qemu-devel@nongnu.org; Tue, 10 Mar 2026 14:32:02 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w01s9-0007hC-8V for qemu-devel@nongnu.org; Tue, 10 Mar 2026 14:32:02 -0400 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-2a871daa98fso98608945ad.1 for ; Tue, 10 Mar 2026 11:32:00 -0700 (PDT) Received: from localhost.localdomain ([123.19.166.13]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ae840b2e9dsm209437015ad.85.2026.03.10.11.31.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 11:31:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773167519; x=1773772319; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ij/BbbSlxGP9JNf8FSJsHo5Km+Y3EWVXNZBcQXu31hs=; b=EJZ5iaJPgdmN4JAD1GuCgzLesnw0EvZnXfYT6XoHE49w/y4RcxhrbFqEGDbkhjmxY3 a03c4clUNKQL5+G8EnhHc+jD2/oeMNHYiiHyAwGsctgUWtHJEc8y0SSEXb6alw/ydmNh tABS3GIcKLXyhcTIMQM17GqIw5o/P+S8TSNPA/7AchwULFDi5R1Mb69UXM0s4NdBqTZU BsjjQYFiSKaAU2Uc0moEidAZzNPi4AaIrdgh7MXq0HHEXswJC2DEvcMiiFi5ZOOUglTx /phCDBDOMd/VTfIK+awKOCkxDLT4RK/9Bc08FiTS24SYXjTcXpELoY8cGaVTCBzf8Dyp S5wg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773167519; x=1773772319; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ij/BbbSlxGP9JNf8FSJsHo5Km+Y3EWVXNZBcQXu31hs=; b=lxSixEmSU1e0LLkajU3h+/8bQJdaLn3mm+IWp1I2qpc9bFli0VejOA0axA5wIQj03S /wJ+dmxD0Iq8NiwV43l4T69hnn/Em3BzoRRlkytQkbFWgWTVesUSZLL7L0btkFQrbQTu BEm/4p6XHxECsHZdO4EfuN1jKaHx6rlKhXuEcB5G2ZO2krPv5HuAlQSd8h0l8vNuw5uI lzUifPi5KafH4EGPWCRNUG4HwEUy2gPe20Prwq34lGBr/x/WGuTXA7+V+WmPgBrydUJ9 AhpfOIzXU/8VOAquWQzNb0wKxIT9D9HTDY6zB9owDRt8RikKX0mqdwmVfHHKrHWPagBn wSpw== X-Gm-Message-State: AOJu0Yz/p+dD3WZ00IHSrUQlEJdHDUMOp7i4AUP+0kG+eaZ9b0SOvruj 9lnH+49HbEJAh/jxsjWZ8Hiny5KSVbR457uZ1ck1lBEzxvuoED0XRS2mE30VoLIAFOvsVQ== X-Gm-Gg: ATEYQzzxVXGHzqtAGC085GLcO5mxjVpIxWlKs1bh8BjOMiJML/yrZiNQKTXgljeW9T7 /DtBWtdmueV+3NUs9YG9iAf1qlUxCBEqKHwpWMrbC7KUTzbnQrgCyYCjia/WCK3zOb18ZeiYY7L clnMAs7p/y28V2QZMEiTXMQmEQ7cQ40B9T9woFIkhZ+UyWPnivTBlZX3bFzODTvr4kzeH94PdjW HL2z+DkxLm32dHr9D8eaBtoOOJ5fy249/5B60d9frV+oAmbgnTvbe0VhIardt9N3CAHJVPSyyEa NprqavM21LiImS6IOyKjNnnu/R2ykDD1PuK+faLp4MFn1Hn1I9+BuUkOXnEyB3XsacQZSKI9PeG SzRNzsmFeTcIbJE0D4udHImobxOd/ookSKSO318uaJOBJs95GGChcnWaQu6+f/s5ilrgfEnolyP fK/C8wd3/E2LN+ypIhB/R/avLZRUFaoI5IxJFz3MMephxZvQ== X-Received: by 2002:a17:902:ce88:b0:2ae:593c:48fe with SMTP id d9443c01a7336-2ae823cb7d1mr159888145ad.13.1773167519401; Tue, 10 Mar 2026 11:31:59 -0700 (PDT) From: Trieu Huynh X-Google-Original-From: Trieu Huynh To: qemu-devel@nongnu.org Cc: Trieu Huynh , Corey Minyard , =?UTF-8?q?Cl=C3=A9ment=20Chigot?= , Frederic Konrad , Mark Cave-Ayland , Artyom Tarasenko Subject: [PATCH 2/4] hw/core/loader: fix error handling for get_image_size callers Date: Wed, 11 Mar 2026 01:27:58 +0700 Message-ID: <20260310182801.196443-3-viking4@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260310182801.196443-1-viking4@gmail.com> References: <20260310182801.196443-1-viking4@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2607:f8b0:4864:20::631; envelope-from=vikingtc4@gmail.com; helo=mail-pl1-x631.google.com X-Spam_score_int: 15 X-Spam_score: 1.5 X-Spam_bar: + X-Spam_report: (1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1773167574721154100 Content-Type: text/plain; charset="utf-8" From: Trieu Huynh Check return value of get_image_size() and return early on failure instead of continuing with invalid state. - Use ret < 0 to handle negative return value. - No functional changes. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/413 Signed-off-by: Trieu Huynh --- hw/ipmi/ipmi_bmc_sim.c | 2 ++ hw/sparc/leon3.c | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c index 012e2ee4fe..fd875491f5 100644 --- a/hw/ipmi/ipmi_bmc_sim.c +++ b/hw/ipmi/ipmi_bmc_sim.c @@ -2561,6 +2561,8 @@ static void ipmi_fru_init(IPMIFru *fru) g_free(fru->data); fru->data =3D NULL; } + } else { + error_report("Could not get file size '%s'", fru->filename); } =20 out: diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c index 9147d56bd4..c821dfd3bb 100644 --- a/hw/sparc/leon3.c +++ b/hw/sparc/leon3.c @@ -354,6 +354,11 @@ static void leon3_generic_hw_init(MachineState *machin= e) } else { bios_size =3D -1; } + if (bios_size < 0) { + error_report("could not found or failed to get file size: '%s'", + filename); + exit(1); + } =20 if (bios_size > prom_size) { error_report("could not load prom '%s': file too big", filename); --=20 2.43.0 From nobody Wed Apr 8 03:09:00 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1773167564; cv=none; d=zohomail.com; s=zohoarc; b=ltDiN6WrW9PPQHTb4vqEu3Utxg4TOTx4MMTqPsCzMtxL90e/MMcP0SlALC/OeziCeEB5MmBHSXjh79CblNBWYcgGSV0GNbaDfAFrz0eKjJS0c77d76DLFFgMjg4trKMk3iXfM2kkXb19/xXlUkqBYiBUVxLGdbAPm5FRNq8XhAY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773167564; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=YftEthnO5ZbHmCNgkv0qnfwkakmKxf+SOGKN2IGfTXs=; b=Bmuufox0M3CQPv0Sj0bKM6katP/lwzmeBeGgVcblepm1loeekuTWwBIYa5javIdQ08RFYo1iXqLPy33f3Nb3PiNOU3uLlwV7GOnbcP6J8CZEPLczSVU/gk+t5jg9HE129W0ihh2yV33UCzZ/wrT6p8FqNSoXcNVd02ZVHjya2yg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773167564078442.49666920790366; Tue, 10 Mar 2026 11:32:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w01sJ-000242-EU; Tue, 10 Mar 2026 14:32:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w01sH-00023m-7Q for qemu-devel@nongnu.org; Tue, 10 Mar 2026 14:32:09 -0400 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w01sF-0007iB-GB for qemu-devel@nongnu.org; Tue, 10 Mar 2026 14:32:08 -0400 Received: by mail-pj1-x102d.google.com with SMTP id 98e67ed59e1d1-3598e7155bbso6549154a91.2 for ; Tue, 10 Mar 2026 11:32:07 -0700 (PDT) Received: from localhost.localdomain ([123.19.166.13]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ae840b2e9dsm209437015ad.85.2026.03.10.11.32.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 11:32:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773167526; x=1773772326; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YftEthnO5ZbHmCNgkv0qnfwkakmKxf+SOGKN2IGfTXs=; b=mRNEx2fbCsMgzTL2IalXcc9+sxhnrlIFHitDFTnZzvd2tZUkyAtpyO/uaJmbhkrHNu DnYIoNfczcI3da2NgFyhhsCls8ZKFVHyEob9vJb/hQ4ri3FrGw4+yXWKtnbejhRx12Et YvLYMY94eSmlDoT5FDWmdCHZl5IyWeIqbxesuB1gsO6s3QfSFJmgzMEMopVCyNysuTnx DHVjFy+/8fyGopmxjsm68YzF9cyXYLw14G9/nq9ir0EFq4ir+NfYq/7aritHGUG4Y0Y/ /sToW9Nd/bUvTi/0qhR45+TvEDUeturr+AbY51iAs11kZm16O1h3O3s4ORDJ1ge6GRFp 40Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773167526; x=1773772326; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=YftEthnO5ZbHmCNgkv0qnfwkakmKxf+SOGKN2IGfTXs=; b=odSAKZif5eaKuOSah/jtudF2GJRnhmj7KMs4l5Km3zEBvEPfeVopkxPlmOOzMo0oRp c5u0nSI1MAug1Q8Ftd1f/yUR/rvIkLnzDhHWX5P5r8Uv2ECxVIF4OaxGW/cmoPg1zQg4 Yo5D6D1PpMtz2ezBrrUmhj0qf7OixstRzcjf6wHVe/ABuhFbR1MTm+dcq4xyEoRNOpit pNDSxasNMtIi5r9lmUZFSTC5wIfpt67qgpJ6YRA4SmAV9OnJV+rADCD1dopXVbXDhbNv pKaHzlhPE4lykX5rhLuGIyHHKCB8mJ2mMM1s9t5optk84GUT+hsvDg4QlZPkMvBni9CV NM4A== X-Gm-Message-State: AOJu0YxVmBMHiXtY2ahOMbU1MogEnhAyYb0iO6SZXoMTLBf5U+pKntkb BgLJXQ1XHMrcNEja1kKdsiPEUI88H3DTCgXpu3aU7CcrIsVnZ6jgNHFQ4Yqrj7wosIMSKQ== X-Gm-Gg: ATEYQzwhxQ+0/1LDRo3ZyXP16vX578H+S7rRQaC5EwrCuooOc4QXIc0Fp82L+XH1sSo g4Oxjwrt4SsLBktke7SsIZD2foBgz42Ck8JaCzYbg/3FPRjlaLW2YXnKgkH8TTk2KV9tUpC9VF0 K6r6BAeAw/cM/YMx4i4Kka/82KbwEDDDmtsxPrAkTwcyPvankMnmnQwvpMsKz9FmGS+KR6AJ5nE fiCLx6pQfoTBME337LH1puxzHtV96KJt/b9+3NNebPUxOHiDlM52lepUs2wmtTXAbSW3UMau2/D elIu2DShidnQHrpt8Nk7rO+fS9eZ5Fpovdi3drokNudQgfL9d8HlJWN46f68qPHHMT/pcYTgrZW aKHssOhUWRlw2De+E8aXoLax5ou1tM6INHOh1rp5TNtBheMTLvx9iUqkb0LCR/ah29A4xabimWc Y0AdVaeZdyHurXCqfxn1BNSp7oPqZpNEX1Dvr9acFUomU/Uw== X-Received: by 2002:a17:903:3845:b0:2ae:80a3:ca7d with SMTP id d9443c01a7336-2ae8246be97mr176422845ad.39.1773167525946; Tue, 10 Mar 2026 11:32:05 -0700 (PDT) From: Trieu Huynh X-Google-Original-From: Trieu Huynh To: qemu-devel@nongnu.org Cc: Trieu Huynh , "Maciej S. Szmigiero" , Elena Ufimtseva , Jagannathan Raman , Thomas Huth , Alex Williamson , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Tony Krowiak , Halil Pasic , Jason Herne , Eric Farman , Matthew Rosato , "Michael S. Tsirkin" , Stefano Garzarella , qemu-s390x@nongnu.org Subject: [PATCH 3/4] util/event_notifier: fix error handling for event_notifier_init callers Date: Wed, 11 Mar 2026 01:27:59 +0700 Message-ID: <20260310182801.196443-4-viking4@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260310182801.196443-1-viking4@gmail.com> References: <20260310182801.196443-1-viking4@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2607:f8b0:4864:20::102d; envelope-from=vikingtc4@gmail.com; helo=mail-pj1-x102d.google.com X-Spam_score_int: 15 X-Spam_score: 1.5 X-Spam_bar: + X-Spam_report: (1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1773167566558158500 Content-Type: text/plain; charset="utf-8" From: Trieu Huynh Check return value of event_notifier_init() and return early on failure instead of continuing with invalid state. - Use ret < 0 to handle negative return value. - No functional changes. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/413 Signed-off-by: Trieu Huynh Acked-by:=C2=A0 Anthony Krowiak Reviewed-by: Jagannathan Raman --- hw/hyperv/hyperv.c | 4 ++-- hw/hyperv/vmbus.c | 4 ++-- hw/remote/proxy.c | 15 +++++++++++++-- hw/vfio/ap.c | 2 +- hw/vfio/ccw.c | 2 +- hw/vfio/pci-quirks.c | 2 +- hw/vfio/pci.c | 2 +- hw/virtio/vhost-vdpa.c | 4 ++-- 8 files changed, 23 insertions(+), 12 deletions(-) diff --git a/hw/hyperv/hyperv.c b/hw/hyperv/hyperv.c index 27e323a819..aa278b179e 100644 --- a/hw/hyperv/hyperv.c +++ b/hw/hyperv/hyperv.c @@ -439,7 +439,7 @@ HvSintRoute *hyperv_sint_route_new(uint32_t vp_index, u= int32_t sint, sint_route->staged_msg->cb_data =3D cb_data; =20 r =3D event_notifier_init(ack_notifier, false); - if (r) { + if (r < 0) { goto cleanup_err_sint; } event_notifier_set_handler(ack_notifier, sint_ack_handler); @@ -453,7 +453,7 @@ HvSintRoute *hyperv_sint_route_new(uint32_t vp_index, u= int32_t sint, =20 /* We need to setup a GSI for this SintRoute */ r =3D event_notifier_init(&sint_route->sint_set_notifier, false); - if (r) { + if (r < 0) { goto cleanup_err_sint; } =20 diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c index c5bab5d245..2f0d2a03d8 100644 --- a/hw/hyperv/vmbus.c +++ b/hw/hyperv/vmbus.c @@ -1425,7 +1425,7 @@ static void open_channel(VMBusChannel *chan) goto put_gpadl; } =20 - if (event_notifier_init(&chan->notifier, 0)) { + if (event_notifier_init(&chan->notifier, 0) < 0) { goto put_gpadl; } =20 @@ -2416,7 +2416,7 @@ static void vmbus_realize(BusState *bus, Error **errp) } =20 ret =3D event_notifier_init(&vmbus->notifier, 0); - if (ret !=3D 0) { + if (ret < 0) { error_setg(errp, "event notifier failed to init with %d", ret); goto remove_msg_handler; } diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c index 5081d67e7f..e91566509f 100644 --- a/hw/remote/proxy.c +++ b/hw/remote/proxy.c @@ -52,9 +52,20 @@ static void setup_irqfd(PCIProxyDev *dev) PCIDevice *pci_dev =3D PCI_DEVICE(dev); MPQemuMsg msg; Error *local_err =3D NULL; + int ret =3D 0; =20 - event_notifier_init(&dev->intr, 0); - event_notifier_init(&dev->resample, 0); + ret =3D event_notifier_init(&dev->intr, 0); + if (ret < 0) { + error_report("Failed to init intr notifier: %s", strerror(-ret)); + return; + } + + ret =3D event_notifier_init(&dev->resample, 0); + if (ret < 0) { + error_report("Failed to init resample notifier: %s", strerror(-ret= )); + event_notifier_cleanup(&dev->intr); + return; + } =20 memset(&msg, 0, sizeof(MPQemuMsg)); msg.cmd =3D MPQEMU_CMD_SET_IRQFD; diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c index e58a0169af..5c8f305653 100644 --- a/hw/vfio/ap.c +++ b/hw/vfio/ap.c @@ -180,7 +180,7 @@ static bool vfio_ap_register_irq_notifier(VFIOAPDevice = *vapdev, return false; } =20 - if (event_notifier_init(notifier, 0)) { + if (event_notifier_init(notifier, 0) < 0) { error_setg_errno(errp, errno, "vfio: Unable to init event notifier for irq (%d)= ", irq); diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c index 2251facb35..ce9c014e6a 100644 --- a/hw/vfio/ccw.c +++ b/hw/vfio/ccw.c @@ -418,7 +418,7 @@ static bool vfio_ccw_register_irq_notifier(VFIOCCWDevic= e *vcdev, return false; } =20 - if (event_notifier_init(notifier, 0)) { + if (event_notifier_init(notifier, 0) < 0) { error_setg_errno(errp, errno, "vfio: Unable to init event notifier for irq (%d)= ", irq); diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c index 7b907b9360..66e02b15a4 100644 --- a/hw/vfio/pci-quirks.c +++ b/hw/vfio/pci-quirks.c @@ -318,7 +318,7 @@ static VFIOIOEventFD *vfio_ioeventfd_init(VFIOPCIDevice= *vdev, =20 ioeventfd =3D g_malloc0(sizeof(*ioeventfd)); =20 - if (event_notifier_init(&ioeventfd->e, 0)) { + if (event_notifier_init(&ioeventfd->e, 0) < 0) { g_free(ioeventfd); return NULL; } diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index c89f3fbea3..29bf6511b3 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -70,7 +70,7 @@ static bool vfio_notifier_init(VFIOPCIDevice *vdev, Event= Notifier *e, } =20 ret =3D event_notifier_init(e, 0); - if (ret) { + if (ret < 0) { error_setg_errno(errp, -ret, "vfio_notifier_init %s failed", name); return false; } diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 2f8f11df86..9c7634e243 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -1075,13 +1075,13 @@ static int vhost_vdpa_svq_set_fds(struct vhost_dev = *dev, int r; =20 r =3D event_notifier_init(&svq->hdev_kick, 0); - if (r !=3D 0) { + if (r < 0) { error_setg_errno(errp, -r, "Couldn't create kick event notifier"); goto err_init_hdev_kick; } =20 r =3D event_notifier_init(&svq->hdev_call, 0); - if (r !=3D 0) { + if (r < 0) { error_setg_errno(errp, -r, "Couldn't create call event notifier"); goto err_init_hdev_call; } --=20 2.43.0 From nobody Wed Apr 8 03:09:00 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1773167564; cv=none; d=zohomail.com; s=zohoarc; b=H6em2I3hSsRncxZ7tZzcEEsb0NjLpSWxLESTYLYTdKV5U4RPPeDXwS+aMBOQxfREa3puLrJCyZLSNBe8NgD0scfB4YKYrS4d1yKEwpa3XoHakTFC3Vz+cHzCrLi9qssirxPejve4CGr6r0xzl/p+5o1mEm9px5su1ERa43eopRM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773167564; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=f4WMeVTtNyCYe5DqHr0pijVf9waAyr2THm7rATwiVXo=; b=LKnHmiYNpc+ZpNDg9V3WPmoNNw4NS8mr8tfVot39lZSgGStyyeV3fJWlBi87WiKHT69e+D9xgfca2G8GYnQVJ2n4xNs+7w7MKRt3hMiH6SPBbT8QadjhEvEtTZpOt2upovohW1LzphIaOZ7cTps5aQiDNWsH8x+Sr1sjK/kzmIg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773167564268269.27987730095435; Tue, 10 Mar 2026 11:32:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w01sT-00028F-87; Tue, 10 Mar 2026 14:32:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w01sQ-00027R-Hc for qemu-devel@nongnu.org; Tue, 10 Mar 2026 14:32:18 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w01sO-0007jU-QN for qemu-devel@nongnu.org; Tue, 10 Mar 2026 14:32:18 -0400 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-2ae3a2f6007so76505705ad.2 for ; Tue, 10 Mar 2026 11:32:16 -0700 (PDT) Received: from localhost.localdomain ([123.19.166.13]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ae840b2e9dsm209437015ad.85.2026.03.10.11.32.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2026 11:32:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773167535; x=1773772335; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=f4WMeVTtNyCYe5DqHr0pijVf9waAyr2THm7rATwiVXo=; b=JzCv6aQ7s0HVphw7MxWiTNg4KtahQpHk4ZJtu0aIN7MkUVHqjd3G51hRJcqBUyD9sF CoO1bUuPuemR4QABtrigw1njAeHXxlWcjC9PCx5osKpVuzWCPlncAhil8bdXhe83zOw0 jJlaPogMdYbfERilas8DHJZu6lhyrTn4zrO+0hc5Y8sUuJdA7CdIvJKPdTI2rvpDzsoa xKCaLJzfTWJQ5nd3IKXss6QJ6YWhzyxXIcHPuRNcZG7aL59pBq7Sowmt4L1vhnJ4EAO9 S5EhHNEz1ykFUZ0H5zIc4dfak6595Nc/q0HKmBsf0Je6nkQ5ymc6LKWUtPK2VSSk5sVr 21og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773167535; x=1773772335; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=f4WMeVTtNyCYe5DqHr0pijVf9waAyr2THm7rATwiVXo=; b=ap0/KqHGOFMGQ5GM6174PQx++vCHK8PXkZNK5xNFc+PGTPLD/eMtr9EKGmRUmyloff YapB25GE8mSoDuIqNCIZF45vv0+WUOdgk3mb26f4NFldBvApa1YTiidFKlW0Ebk0gjXC lUiTLWxkd5vwluJt/0SgWK91wZXjpM/0H/fhE8arfNOneSimj5n5QpZ8oLiQFA1M77z2 EGshG/JHwQqOu0R7s36GAjGxD7fS6SCwUsasftA2PYiUZzF9XUO6+a1wgi02L6EqbV2j 765q1sLlFU+KHMXqZkHgSpDstPoFw7L/DFqiY+OwukaVwUcRrYIg/grq+mGgDqrsANr3 01XA== X-Gm-Message-State: AOJu0Yzinhjd+p51AxTpaAMrXwN1fvr05pHaBMr99BD2MJOH9kuL39We qDlZK0JqNDrgvEvkpmSWyKuJKX0WOifqNBBCgRHZwzJqwbsfDa3HzzbtcqGNLNblE0XmSQ== X-Gm-Gg: ATEYQzz0sVzfcfvEusDSwav4wglgwAltFH/SgbQLYPJN0tlZ4OJEkVgsowpY+umHE7Q zXjwZULeev7D9oEht8ivrStDhxCdNOO/fbyh7kCYtCZ4FfXLhhzq9VuAzqfGRst3dbSMxbOCIS+ CSwDzmpMrZHOySAFI3fjVh07B9PjuGV8bFkAs5mbpx5wrUveK7q9RHfcukb0OKX/qRzeYxudUyB huLA5FEYm2w+xZnX4yqSnlExD30XKmuBjCqbU11NaHJ9ZSoPzTksNxr9bqSLuzHuKYYQ+TaP82y 38EQjzMkR6lbCcA1lS0yW2gCsyHea1qpP94QIg0X9fJnTGCIxL7ZwQb8ulllHskTT+J7BJy9eQ9 WBYUt04DEjLjfyn24ygdbjfqxpmRJL0mLwH58J9Cod27k1juRiX9wdeUMN3uJGncAhyWUCmWAS3 7OOFmERDtzNYHYiJqVrJfQHEhbAwXVqpwkOw6jBOzo/CInbg== X-Received: by 2002:a17:903:32c1:b0:2ae:4645:6f77 with SMTP id d9443c01a7336-2ae82455f70mr164858565ad.20.1773167534894; Tue, 10 Mar 2026 11:32:14 -0700 (PDT) From: Trieu Huynh X-Google-Original-From: Trieu Huynh To: qemu-devel@nongnu.org Cc: Trieu Huynh , Akihiko Odaki , Sriram Yagnaraman , Jason Wang , Jiri Pirko , "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Fam Zheng , Hannes Reinecke , qemu-block@nongnu.org Subject: [PATCH 4/4] hw/pci/msix: fix error handling for msix_init callers Date: Wed, 11 Mar 2026 01:28:00 +0700 Message-ID: <20260310182801.196443-5-viking4@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260310182801.196443-1-viking4@gmail.com> References: <20260310182801.196443-1-viking4@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2607:f8b0:4864:20::62b; envelope-from=vikingtc4@gmail.com; helo=mail-pl1-x62b.google.com X-Spam_score_int: 15 X-Spam_score: 1.5 X-Spam_bar: + X-Spam_report: (1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1773167567530154100 Content-Type: text/plain; charset="utf-8" From: Trieu Huynh Check return value of msix_init() and return early on failure instead of continuing with invalid state. - Use ret < 0 to handle negative return value. - No functional changes. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/413 Signed-off-by: Trieu Huynh --- hw/net/igbvf.c | 2 +- hw/net/rocker/rocker.c | 2 +- hw/pci/msix.c | 2 +- hw/scsi/megasas.c | 16 +++++++++++----- hw/usb/hcd-xhci-pci.c | 17 ++++++++++++----- 5 files changed, 26 insertions(+), 13 deletions(-) diff --git a/hw/net/igbvf.c b/hw/net/igbvf.c index 48d56e43ac..9a165c7063 100644 --- a/hw/net/igbvf.c +++ b/hw/net/igbvf.c @@ -260,7 +260,7 @@ static void igbvf_pci_realize(PCIDevice *dev, Error **e= rrp) =20 ret =3D msix_init(dev, IGBVF_MSIX_VEC_NUM, &s->msix, IGBVF_MSIX_BAR_ID= X, 0, &s->msix, IGBVF_MSIX_BAR_IDX, 0x2000, 0x70, errp); - if (ret) { + if (ret < 0) { return; } =20 diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c index 4a7056bd45..910dce901b 100644 --- a/hw/net/rocker/rocker.c +++ b/hw/net/rocker/rocker.c @@ -1228,7 +1228,7 @@ static int rocker_msix_init(Rocker *r, Error **errp) &r->msix_bar, ROCKER_PCI_MSIX_BAR_IDX, ROCKER_PCI_MSIX_PBA_OFFSET, 0, errp); - if (err) { + if (err < 0) { return err; } =20 diff --git a/hw/pci/msix.c b/hw/pci/msix.c index b35476d057..1b23eaf100 100644 --- a/hw/pci/msix.c +++ b/hw/pci/msix.c @@ -432,7 +432,7 @@ int msix_init_exclusive_bar(PCIDevice *dev, uint32_t ne= ntries, 0, &dev->msix_exclusive_bar, bar_nr, bar_pba_offset, 0, errp); - if (ret) { + if (ret < 0) { return ret; } =20 diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index f62e420a91..90d397374e 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -2380,11 +2380,17 @@ static void megasas_scsi_realize(PCIDevice *dev, Er= ror **errp) memory_region_init_io(&s->queue_io, OBJECT(s), &megasas_queue_ops, s, "megasas-queue", 0x40000); =20 - if (megasas_use_msix(s) && - msix_init(dev, 15, &s->mmio_io, b->mmio_bar, 0x2000, - &s->mmio_io, b->mmio_bar, 0x3800, 0x68, NULL)) { - /* TODO: check msix_init's error, and should fail on msix=3Don */ - s->msix =3D ON_OFF_AUTO_OFF; + if (megasas_use_msix(s)) { + ret =3D msix_init(dev, 15, &s->mmio_io, b->mmio_bar, 0x2000, + &s->mmio_io, b->mmio_bar, 0x3800, 0x68, NULL); + + if (ret < 0) { + if (s->msix =3D=3D ON_OFF_AUTO_ON) { + error_setg(errp, "MSI-X initialization failed"); + return; + } + s->msix =3D ON_OFF_AUTO_OFF; + } } =20 if (pci_is_express(dev)) { diff --git a/hw/usb/hcd-xhci-pci.c b/hw/usb/hcd-xhci-pci.c index aa570506fc..7bd4425b34 100644 --- a/hw/usb/hcd-xhci-pci.c +++ b/hw/usb/hcd-xhci-pci.c @@ -173,11 +173,18 @@ static void usb_xhci_pci_realize(struct PCIDevice *de= v, Error **errp) } =20 if (s->msix !=3D ON_OFF_AUTO_OFF) { - /* TODO check for errors, and should fail when msix=3Don */ - msix_init(dev, s->xhci.numintrs, - &s->xhci.mem, 0, OFF_MSIX_TABLE, - &s->xhci.mem, 0, OFF_MSIX_PBA, - 0x90, NULL); + ret =3D msix_init(dev, s->xhci.numintrs, + &s->xhci.mem, 0, OFF_MSIX_TABLE, + &s->xhci.mem, 0, OFF_MSIX_PBA, + 0x90, NULL); + + if (ret < 0) { + if (s->msix =3D=3D ON_OFF_AUTO_ON) { + error_setg(errp, "MSI-X initialization failed"); + return; + } + s->msix =3D ON_OFF_AUTO_OFF; + } } s->xhci.as =3D pci_get_address_space(dev); } --=20 2.43.0