]> xenbits.xensource.com Git - people/aperard/qemu-dm.git/commitdiff
module: Prevent crash by resetting local_err in module_load_qom_all()
authorAlexander Ivanov <alexander.ivanov@virtuozzo.com>
Fri, 9 Aug 2024 12:13:40 +0000 (14:13 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Tue, 13 Aug 2024 14:35:47 +0000 (16:35 +0200)
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>
util/module.c

index 32e263163c75dfa8e93ca67c739d4a501162353c..3eb0f06df165503f81c3cbc6657557666307506c 100644 (file)
@@ -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;
         }