]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
hw/xen: Fix xen_bus_realize() error handling
authorMarkus Armbruster <armbru@redhat.com>
Fri, 14 Mar 2025 14:34:59 +0000 (15:34 +0100)
committerMarkus Armbruster <armbru@redhat.com>
Wed, 19 Mar 2025 08:36:15 +0000 (09:36 +0100)
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL.  Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call.

xen_bus_realize() is wrong that way: it passes &local_err to
xs_node_watch() in a loop.  If this fails in more than one iteration,
it can trip error_setv()'s assertion.

Fix by clearing @local_err.

Fixes: c4583c8c394e (xen-bus: reduce scope of backend watch)
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20250314143500.2449658-2-armbru@redhat.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
hw/xen/xen-bus.c

index 8260f1e1bbfa697c2d305d800ab8a2729c348d5d..2aacc1436fec1fc304cc6093e52ae566bffb59ad 100644 (file)
@@ -357,6 +357,7 @@ static void xen_bus_realize(BusState *bus, Error **errp)
             error_reportf_err(local_err,
                               "failed to set up '%s' enumeration watch: ",
                               type[i]);
+            local_err = NULL;
         }
 
         g_free(node);