From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: Cornelia Huck <cohuck@redhat.com>,
Matthew Rosato <mjrosato@linux.ibm.com>
Subject: [PATCH 04/11] s390x/pci: Fix harmless mistake in zpci's property fid's setter
Date: Fri, 24 Apr 2020 21:20:20 +0200 [thread overview]
Message-ID: <20200424192027.11404-5-armbru@redhat.com> (raw)
In-Reply-To: <20200424192027.11404-1-armbru@redhat.com>
s390_pci_set_fid() sets zpci->fid_defined to true even when
visit_type_uint32() failed. Reproducer: "-device zpci,fid=junk".
Harmless in practice, because qdev_device_add() then fails, throwing
away @zpci. Fix it anyway.
Cc: Matthew Rosato <mjrosato@linux.ibm.com>
Cc: Cornelia Huck <cohuck@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/s390x/s390-pci-bus.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c
index ed8be124da..19ee1f02bb 100644
--- a/hw/s390x/s390-pci-bus.c
+++ b/hw/s390x/s390-pci-bus.c
@@ -1276,7 +1276,9 @@ static void s390_pci_set_fid(Object *obj, Visitor *v, const char *name,
return;
}
- visit_type_uint32(v, name, ptr, errp);
+ if (!visit_type_uint32(v, name, ptr, errp)) {
+ return;
+ }
zpci->fid_defined = true;
}
--
2.21.1
next prev parent reply other threads:[~2020-04-24 19:21 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-24 19:20 [PATCH 00/11] More miscellaneous error handling fixes Markus Armbruster
2020-04-24 19:20 ` [PATCH 01/11] nvdimm: Plug memory leak in uuid property setter Markus Armbruster
2020-04-24 19:20 ` [PATCH 02/11] xen: Fix and improve handling of device_add usb-host errors Markus Armbruster
2020-04-27 7:26 ` Paul Durrant
2020-04-29 5:48 ` Markus Armbruster
2020-04-24 19:20 ` [PATCH 03/11] s390x/cpumodel: Fix harmless misuse of visit_check_struct() Markus Armbruster
2020-04-27 8:02 ` David Hildenbrand
2020-04-29 5:51 ` Markus Armbruster
2020-05-04 11:09 ` Cornelia Huck
2020-05-04 15:24 ` Markus Armbruster
2020-05-04 15:29 ` Cornelia Huck
2020-04-24 19:20 ` Markus Armbruster [this message]
2020-04-27 14:11 ` [PATCH 04/11] s390x/pci: Fix harmless mistake in zpci's property fid's setter Matthew Rosato
2020-04-27 14:40 ` Markus Armbruster
2020-04-24 19:20 ` [PATCH 05/11] tests/migration: Tighten error checking Markus Armbruster
2020-04-24 19:20 ` [PATCH 06/11] error: Use error_reportf_err() where appropriate Markus Armbruster
2020-04-24 20:08 ` Eric Blake
2020-04-27 8:53 ` Markus Armbruster
2020-04-27 9:26 ` Philippe Mathieu-Daudé
2020-04-27 13:59 ` Eric Blake
2020-04-24 19:20 ` [PATCH 07/11] mips/malta: Fix create_cps() error handling Markus Armbruster
2020-04-27 9:20 ` Philippe Mathieu-Daudé
2020-04-29 5:59 ` Markus Armbruster
2020-04-29 7:13 ` Philippe Mathieu-Daudé
2020-04-29 7:27 ` Markus Armbruster
2020-04-24 19:20 ` [PATCH 08/11] mips/boston: Fix boston_mach_init() " Markus Armbruster
2020-04-29 6:33 ` Markus Armbruster
2020-04-24 19:20 ` [PATCH 09/11] mips/boston: Plug memory leak in boston_mach_init() Markus Armbruster
2020-04-24 19:20 ` [PATCH 10/11] arm/sabrelite: Consistently use &error_fatal in sabrelite_init() Markus Armbruster
2020-04-27 9:17 ` Philippe Mathieu-Daudé
2020-04-24 19:20 ` [PATCH 11/11] i386: Fix x86_cpu_load_model() error API violation Markus Armbruster
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=20200424192027.11404-5-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=cohuck@redhat.com \
--cc=mjrosato@linux.ibm.com \
--cc=qemu-devel@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).