From: Cornelia Huck <cohuck@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Cornelia Huck <cohuck@redhat.com>,
qemu-s390x@nongnu.org, David Hildenbrand <david@redhat.com>,
qemu-devel@nongnu.org, Markus Armbruster <armbru@redhat.com>
Subject: [PULL v2 10/16] s390x/event-facility: Fix realize() error API violations
Date: Sat, 14 Dec 2019 10:45:20 +0100 [thread overview]
Message-ID: <20191214094526.8698-11-cohuck@redhat.com> (raw)
In-Reply-To: <20191214094526.8698-1-cohuck@redhat.com>
From: Markus Armbruster <armbru@redhat.com>
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>
---
hw/s390x/event-facility.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
index 66205697ae75..cdcf9154c49e 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;
}
}
--
2.21.0
next prev parent reply other threads:[~2019-12-14 9:54 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-14 9:45 [PULL v2 00/16] first s390x update for 5.0 Cornelia Huck
2019-12-14 9:45 ` [PULL v2 01/16] vfio-ccw: Fix error message Cornelia Huck
2019-12-14 9:45 ` [PULL v2 02/16] hw: add compat machines for 5.0 Cornelia Huck
2019-12-14 9:45 ` [PULL v2 03/16] s390x: Don't do a normal reset on the initial cpu Cornelia Huck
2019-12-14 9:45 ` [PULL v2 04/16] s390x: Move reset normal to shared reset handler Cornelia Huck
2019-12-14 9:45 ` [PULL v2 05/16] s390x: Move initial reset Cornelia Huck
2019-12-14 9:45 ` [PULL v2 06/16] s390x: Move clear reset Cornelia Huck
2019-12-14 9:45 ` [PULL v2 07/16] s390x: Beautify diag308 handling Cornelia Huck
2019-12-14 9:45 ` [PULL v2 08/16] s390x: kvm: Make kvm_sclp_service_call void Cornelia Huck
2019-12-14 9:45 ` [PULL v2 09/16] s390x: Fix cpu normal reset ri clearing Cornelia Huck
2019-12-14 9:45 ` Cornelia Huck [this message]
2019-12-14 9:45 ` [PULL v2 11/16] s390x/cpumodel: Fix feature property error API violations Cornelia Huck
2019-12-14 9:45 ` [PULL v2 12/16] s390x/cpumodel: Fix realize() " Cornelia Huck
2019-12-14 9:45 ` [PULL v2 13/16] s390x/cpumodel: Fix query-cpu-model-FOO " Cornelia Huck
2019-12-14 9:45 ` [PULL v2 14/16] s390x/cpumodel: Fix query-cpu-definitions " Cornelia Huck
2019-12-14 9:45 ` [PULL v2 15/16] s390x/tcg: clear local interrupts on reset normal Cornelia Huck
2019-12-14 9:45 ` [PULL v2 16/16] qga: fence guest-set-time if hwclock not available Cornelia Huck
2020-01-03 12:05 ` Peter Maydell
2019-12-16 13:04 ` [PULL v2 00/16] first s390x update for 5.0 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191214094526.8698-11-cohuck@redhat.com \
--to=cohuck@redhat.com \
--cc=armbru@redhat.com \
--cc=david@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).