Commit 17d5d49a authored by Markus Armbruster's avatar Markus Armbruster
Browse files

hw/arm/armsse: Fix armsse_realize() error API violation 



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.

armsse_realize() is wrong that way: it passes &err to
object_property_set_int() multiple times without checking it, and then
to sysbus_realize().  Harmless, because the former can't actually fail
here.

Fix by passing &error_abort instead.

Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20200630090351.1247703-25-armbru@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
parent 2255f6b7

hw/arm/armsse.c

+4 −4
Original line number Diff line number Diff line
@@ -990,13 +990,13 @@ static void armsse_realize(DeviceState *dev, Error **errp) 
    sysbus_mmio_map(SYS_BUS_DEVICE(&s->sysinfo), 0, 0x40020000);

    /* System control registers */

    object_property_set_int(OBJECT(&s->sysctl), info->sys_version,

                            "SYS_VERSION", &err);

                            "SYS_VERSION", &error_abort);

    object_property_set_int(OBJECT(&s->sysctl), info->cpuwait_rst,

                            "CPUWAIT_RST", &err);

                            "CPUWAIT_RST", &error_abort);

    object_property_set_int(OBJECT(&s->sysctl), s->init_svtor,

                            "INITSVTOR0_RST", &err);

                            "INITSVTOR0_RST", &error_abort);

    object_property_set_int(OBJECT(&s->sysctl), s->init_svtor,

                            "INITSVTOR1_RST", &err);

                            "INITSVTOR1_RST", &error_abort);

    sysbus_realize(SYS_BUS_DEVICE(&s->sysctl), &err);

    if (err) {

        error_propagate(errp, err);