diff options
author | Markus Armbruster <armbru@redhat.com> | 2020-06-30 11:03:49 +0200 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2020-07-02 11:54:47 +0200 |
commit | 17d5d49a4e877b08ebf82aa33b349176281e68a3 (patch) | |
tree | d08b616006c9862724d924c6b958c9b10bb1a3de | |
parent | 2255f6b7966d981054397765a700e8a34c6a15c4 (diff) | |
download | qemu-17d5d49a4e877b08ebf82aa33b349176281e68a3.zip qemu-17d5d49a4e877b08ebf82aa33b349176281e68a3.tar.gz qemu-17d5d49a4e877b08ebf82aa33b349176281e68a3.tar.bz2 |
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: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200630090351.1247703-25-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
-rw-r--r-- | hw/arm/armsse.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c index a851652..2fbd970 100644 --- a/hw/arm/armsse.c +++ b/hw/arm/armsse.c @@ -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); |