[Stable-8.2.7,46/53] module: Prevent crash by resetting local_err in module_load_qom_all()

Commit Message

Michael Tokarev Sept. 6, 2024, 6:54 a.m. UTC

From: Alexander Ivanov <[e-mail]>

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 <[e-mail]>
Reviewed-by: Claudio Fontana <[e-mail]>
Reviewed-by: Denis V. Lunev <[e-mail]>
Link: https://lore.kernel.org/r/[e-mail]
[Do the same by moving the declaration instead. - Paolo]
Cc: [e-mail]
Signed-off-by: Paolo Bonzini <[e-mail]>
(cherry picked from commit 940d802b24e63650e0eacad3714e2ce171cba17c)
Signed-off-by: Michael Tokarev <[e-mail]>

Patch

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;
         }