mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s390x/event-facility: Fix realize() error API violations

Browse Source 
sclp_events_bus_realize() dereferences @errp when
object_property_set_bool() fails.  That's wrong; see the big comment
in error.h.  Introduced in commit f6102c329c "s390/sclp: rework sclp
event facility initialization + device realization".

No caller actually passes null.

Fix anyway: splice in a local Error *err, and error_propagate().

Cc: David Hildenbrand <david@redhat.com>
Cc: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Message-Id: <20191204093625.14836-12-armbru@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
Markus Armbruster 2019-12-04 10:36:18 +01:00 committed by Cornelia Huck
parent e893baee70
commit 3d508334dd
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/s390x/event-facility.c
View File

@ -339,14 +339,16 @@ out:
static void sclp_events_bus_realize(BusState *bus, Error **errp) static void sclp_events_bus_realize(BusState *bus, Error **errp)
{ {
Error *err = NULL;
BusChild *kid; BusChild *kid;
/* TODO: recursive realization has to be done in common code */ /* TODO: recursive realization has to be done in common code */
QTAILQ_FOREACH(kid, &bus->children, sibling) { QTAILQ_FOREACH(kid, &bus->children, sibling) {
DeviceState *dev = kid->child; DeviceState *dev = kid->child;
object_property_set_bool(OBJECT(dev), true, "realized", errp); object_property_set_bool(OBJECT(dev), true, "realized", &err);
if (*errp) { if (errp) {
error_propagate(errp, err);
return; return;
} }
} }