From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
qemu-arm@nongnu.org, "Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Andrew Baumann" <Andrew.Baumann@microsoft.com>,
"Jean-Christophe Dubois" <jcd@tribudubois.net>
Subject: [PATCH v3 25/26] arm/{bcm2835, fsl-imx25, fsl-imx6}: Fix realize error API violations
Date: Tue, 30 Jun 2020 11:03:50 +0200 [thread overview]
Message-ID: <20200630090351.1247703-26-armbru@redhat.com> (raw)
In-Reply-To: <20200630090351.1247703-1-armbru@redhat.com>
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.
bcm2835_peripherals_realize(), fsl_imx25_realize() and
fsl_imx6_realize() are wrong that way: they pass &err to
object_property_set_uint() and object_property_set_bool() 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: Andrew Baumann <Andrew.Baumann@microsoft.com>
Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Cc: Jean-Christophe Dubois <jcd@tribudubois.net>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/arm/bcm2835_peripherals.c | 12 ++++--------
hw/arm/fsl-imx25.c | 12 +++++-------
hw/arm/fsl-imx6.c | 12 +++++-------
3 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c
index 1e975d7eec..7ffdf62067 100644
--- a/hw/arm/bcm2835_peripherals.c
+++ b/hw/arm/bcm2835_peripherals.c
@@ -283,16 +283,12 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp)
* For the exact details please refer to the Arasan documentation:
* SD3.0_Host_AHB_eMMC4.4_Usersguide_ver5.9_jan11_10.pdf
*/
- object_property_set_uint(OBJECT(&s->sdhci), 3, "sd-spec-version", &err);
+ object_property_set_uint(OBJECT(&s->sdhci), 3, "sd-spec-version",
+ &error_abort);
object_property_set_uint(OBJECT(&s->sdhci), BCM2835_SDHC_CAPAREG, "capareg",
- &err);
+ &error_abort);
object_property_set_bool(OBJECT(&s->sdhci), true, "pending-insert-quirk",
- &err);
- if (err) {
- error_propagate(errp, err);
- return;
- }
-
+ &error_abort);
sysbus_realize(SYS_BUS_DEVICE(&s->sdhci), &err);
if (err) {
error_propagate(errp, err);
diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c
index f32f9bce0f..7ab5c98fbe 100644
--- a/hw/arm/fsl-imx25.c
+++ b/hw/arm/fsl-imx25.c
@@ -260,15 +260,13 @@ static void fsl_imx25_realize(DeviceState *dev, Error **errp)
};
object_property_set_uint(OBJECT(&s->esdhc[i]), 2, "sd-spec-version",
- &err);
+ &error_abort);
object_property_set_uint(OBJECT(&s->esdhc[i]), IMX25_ESDHC_CAPABILITIES,
- "capareg", &err);
+ "capareg",
+ &error_abort);
object_property_set_uint(OBJECT(&s->esdhc[i]), SDHCI_VENDOR_IMX,
- "vendor", &err);
- if (err) {
- error_propagate(errp, err);
- return;
- }
+ "vendor",
+ &error_abort);
sysbus_realize(SYS_BUS_DEVICE(&s->esdhc[i]), &err);
if (err) {
error_propagate(errp, err);
diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c
index d4bc4fae93..4ae3c3efc2 100644
--- a/hw/arm/fsl-imx6.c
+++ b/hw/arm/fsl-imx6.c
@@ -336,15 +336,13 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)
/* UHS-I SDIO3.0 SDR104 1.8V ADMA */
object_property_set_uint(OBJECT(&s->esdhc[i]), 3, "sd-spec-version",
- &err);
+ &error_abort);
object_property_set_uint(OBJECT(&s->esdhc[i]), IMX6_ESDHC_CAPABILITIES,
- "capareg", &err);
+ "capareg",
+ &error_abort);
object_property_set_uint(OBJECT(&s->esdhc[i]), SDHCI_VENDOR_IMX,
- "vendor", &err);
- if (err) {
- error_propagate(errp, err);
- return;
- }
+ "vendor",
+ &error_abort);
sysbus_realize(SYS_BUS_DEVICE(&s->esdhc[i]), &err);
if (err) {
error_propagate(errp, err);
--
2.26.2
next prev parent reply other threads:[~2020-06-30 9:10 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-30 9:03 [PATCH v3 00/26] Error handling fixes & cleanups Markus Armbruster
2020-06-30 9:03 ` [PATCH v3 01/26] net/virtio: Fix failover_replug_primary() return value regression Markus Armbruster
2020-06-30 9:03 ` [PATCH v3 02/26] pci: Delete useless error_propagate() Markus Armbruster
2020-06-30 9:03 ` [PATCH v3 03/26] Clean up some calls to ignore Error objects the right way Markus Armbruster
2020-06-30 9:21 ` Daniel P. Berrangé
2020-06-30 9:03 ` [PATCH v3 04/26] tests: Use &error_abort where appropriate Markus Armbruster
2020-06-30 9:03 ` [PATCH v3 05/26] tests: Use error_free_or_abort() " Markus Armbruster
2020-06-30 9:03 ` [PATCH v3 06/26] usb/dev-mtp: Fix Error double free after inotify failure Markus Armbruster
2020-06-30 9:20 ` Daniel P. Berrangé
2020-06-30 9:03 ` [PATCH v3 07/26] spapr: Plug minor memory leak in spapr_machine_init() Markus Armbruster
2020-06-30 9:03 ` [PATCH v3 08/26] qga: Plug unlikely memory leak in guest-set-memory-blocks Markus Armbruster
2020-06-30 9:03 ` [PATCH v3 09/26] sd/milkymist-memcard: Plug minor memory leak in realize Markus Armbruster
2020-06-30 9:10 ` Philippe Mathieu-Daudé
2020-06-30 9:03 ` [PATCH v3 10/26] test-util-filemonitor: Plug unlikely memory leak Markus Armbruster
2020-06-30 9:20 ` Daniel P. Berrangé
2020-06-30 9:03 ` [PATCH v3 11/26] vnc: Plug minor memory leak in vnc_display_open() Markus Armbruster
2020-06-30 9:19 ` Daniel P. Berrangé
2020-06-30 9:03 ` [PATCH v3 12/26] aspeed: Clean up roundabout error propagation Markus Armbruster
2020-06-30 9:03 ` [PATCH v3 13/26] qdev: Drop qbus_set_bus_hotplug_handler() parameter @errp Markus Armbruster
2020-06-30 9:03 ` [PATCH v3 14/26] qdev: Drop qbus_set_hotplug_handler() " Markus Armbruster
2020-06-30 9:03 ` [PATCH v3 15/26] hw: Fix error API violation around object_property_set_link() Markus Armbruster
2020-06-30 20:04 ` Mark Cave-Ayland
2020-06-30 9:03 ` [PATCH v3 16/26] hw/arm: Drop useless object_property_set_link() error handling Markus Armbruster
2020-06-30 9:03 ` [PATCH v3 17/26] riscv/sifive_u: Fix sifive_u_soc_realize() error API violations Markus Armbruster
2020-06-30 9:03 ` [PATCH v3 18/26] riscv_hart: Fix riscv_harts_realize() " Markus Armbruster
2020-06-30 9:03 ` [PATCH v3 19/26] mips/cps: Fix mips_cps_realize() " Markus Armbruster
2020-06-30 9:03 ` [PATCH v3 20/26] x86: Fix x86_cpu_new() error handling Markus Armbruster
2020-07-02 4:51 ` Markus Armbruster
2020-07-02 8:59 ` Paolo Bonzini
2020-06-30 9:03 ` [PATCH v3 21/26] amd_iommu: Fix amdvi_realize() error API violation Markus Armbruster
2020-06-30 9:03 ` [PATCH v3 22/26] arm/stm32f205 arm/stm32f405: Fix realize " Markus Armbruster
2020-06-30 9:14 ` Philippe Mathieu-Daudé
2020-07-01 7:24 ` Markus Armbruster
2020-06-30 9:03 ` [PATCH v3 23/26] aspeed: " Markus Armbruster
2020-06-30 9:15 ` Philippe Mathieu-Daudé
2020-06-30 9:03 ` [PATCH v3 24/26] hw/arm/armsse: Fix armsse_realize() " Markus Armbruster
2020-06-30 9:11 ` Philippe Mathieu-Daudé
2020-06-30 9:03 ` Markus Armbruster [this message]
2020-06-30 9:12 ` [PATCH v3 25/26] arm/{bcm2835,fsl-imx25,fsl-imx6}: Fix realize error API violations Philippe Mathieu-Daudé
2020-06-30 9:03 ` [PATCH v3 26/26] migration/rdma: Plug memory leaks in qemu_rdma_registration_stop() Markus Armbruster
2020-06-30 9:33 ` Dr. David Alan Gilbert
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=20200630090351.1247703-26-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=Andrew.Baumann@microsoft.com \
--cc=jcd@tribudubois.net \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-arm@nongnu.org \
--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).