7a16948063
- ppc/xive: Fix ESB length overflow on 32-bit hosts - target/hppa: Fix PSW V-bit packaging in cpu_hppa_get for hppa64 - target/ppc: Fix migration of CPUs with TLB_EMB TLB type - target/arm: Clear high SVE elements in handle_vec_simd_wshli - module: Prevent crash by resetting local_err in module_load_qom_all() - tests/docker: update debian i686 and mipsel images to bookworm - target/arm: Fix SVE SDOT/UDOT/USDOT (4-way, indexed) - docs/sphinx/depfile.py: Handle env.doc2path() returning a Path not a str - block/blkio: use FUA flag on write zeroes only if supported - virtio-pci: Fix the use of an uninitialized irqfd - hw/cxl: Ensure there is enough data to read the input header in cmd_get_physical_port_state() - intel_iommu: Send IQE event when setting reserved bit in IQT_TAIL - virtio-net: Avoid indirection_table_mask overflow - Fix calculation of minimum in colo_compare_tcp - target/riscv/csr.c: Fix an access to VXSAT - linux-user: Clean up unused header - raw-format: Fix error message for invalid offset/size - hw/loongarch/virt: Remove unnecessary 'cpu.h' inclusion - tests: Wait for migration completion on destination QEMU to avoid failures - acpi: ged: Add macro for acpi sleep control register - hw/intc/openpic: Improve errors for out of bounds property values - hw/pci-bridge: Add a Kconfig switch for the normal PCI bridge - docs/tools/qemu-img.rst: fix typo (sumarizes) - audio/pw: Report more accurate error when connecting to PipeWire fails - audio/pw: Report more accurate error when connecting to PipeWire fails - dma: Fix function names in documentation Ensure the function names match. - edu: fix DMA range upper bound check - platform-bus: fix refcount leak - hw/net/can/sja1000: fix bug for single acceptance filter and standard frame - tests/avocado: fix typo in replay_linux - util/userfaultfd: Remove unused uffd_poll_events - Consider discard option when writing zeros - crypto: factor out conversion of QAPI to gcrypt constants - crypto: drop gnutls debug logging support - crypto: use consistent error reporting pattern for unsupported cipher modes - hw/gpio/aspeed_gpio: Avoid shift into sign bit Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit b6e04df301d30895427ab41a1edff0f40149bdd9)
46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
From 7187ed9e2010adfe937d6444eb79d8025c118c2c Mon Sep 17 00:00:00 2001
|
|
From: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
|
|
Date: Fri, 9 Aug 2024 14:13:40 +0200
|
|
Subject: [PATCH] module: Prevent crash by resetting local_err in
|
|
module_load_qom_all()
|
|
|
|
Set local_err to NULL after it has been freed in error_report_err(). This
|
|
avoids triggering assert(*errp == NULL) failure in error_setv() when
|
|
local_err is reused in the loop.
|
|
|
|
Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
|
|
Reviewed-by: Claudio Fontana <cfontana@suse.de>
|
|
Reviewed-by: Denis V. Lunev <den@openvz.org>
|
|
Link: https://lore.kernel.org/r/20240809121340.992049-2-alexander.ivanov@virtuozzo.com
|
|
[Do the same by moving the declaration instead. - Paolo]
|
|
Cc: qemu-stable@nongnu.org
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
(cherry picked from commit 940d802b24e63650e0eacad3714e2ce171cba17c)
|
|
Signed-off-by: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
|
---
|
|
util/module.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/util/module.c b/util/module.c
|
|
index 32e263163c..3eb0f06df1 100644
|
|
--- a/util/module.c
|
|
+++ b/util/module.c
|
|
@@ -354,13 +354,13 @@ int module_load_qom(const char *type, Error **errp)
|
|
void module_load_qom_all(void)
|
|
{
|
|
const QemuModinfo *modinfo;
|
|
- Error *local_err = NULL;
|
|
|
|
if (module_loaded_qom_all) {
|
|
return;
|
|
}
|
|
|
|
for (modinfo = module_info; modinfo->name != NULL; modinfo++) {
|
|
+ Error *local_err = NULL;
|
|
if (!modinfo->objs) {
|
|
continue;
|
|
}
|
|
--
|
|
2.41.0.windows.1
|
|
|