diff options
| author | Markus Armbruster <armbru@redhat.com> | 2019-12-04 10:36:18 +0100 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2019-12-14 10:25:50 +0100 |
| commit | 3d508334dd2c5f920a1b5221124b6633c3bf8e38 (patch) | |
| tree | 4f9e9207151b0ddfe075076841b0f775ee101739 /hw/s390x | |
| parent | e893baee70149896d1e43e341da4d6c614037d5d (diff) | |
| download | qemu-3d508334dd2c5f920a1b5221124b6633c3bf8e38.zip qemu-3d508334dd2c5f920a1b5221124b6633c3bf8e38.tar.gz qemu-3d508334dd2c5f920a1b5221124b6633c3bf8e38.tar.bz2 | |
s390x/event-facility: Fix realize() error API violations
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>
Diffstat (limited to 'hw/s390x')
| -rw-r--r-- | hw/s390x/event-facility.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c index 6620569..cdcf9154 100644 --- a/hw/s390x/event-facility.c +++ b/hw/s390x/event-facility.c @@ -339,14 +339,16 @@ out: static void sclp_events_bus_realize(BusState *bus, Error **errp) { + Error *err = NULL; BusChild *kid; /* TODO: recursive realization has to be done in common code */ QTAILQ_FOREACH(kid, &bus->children, sibling) { DeviceState *dev = kid->child; - object_property_set_bool(OBJECT(dev), true, "realized", errp); - if (*errp) { + object_property_set_bool(OBJECT(dev), true, "realized", &err); + if (errp) { + error_propagate(errp, err); return; } } |