From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: Markus Armbruster <armbru@redhat.com>, qemu-devel@nongnu.org
Cc: "Andrew Jeffery" <andrew@aj.id.au>,
"Peter Maydell" <peter.maydell@linaro.org>,
qemu-arm@nongnu.org, "Cédric Le Goater" <clg@kaod.org>,
"Joel Stanley" <joel@jms.id.au>
Subject: Re: [PATCH v3 23/26] aspeed: Fix realize error API violation
Date: Tue, 30 Jun 2020 11:15:27 +0200 [thread overview]
Message-ID: <ebd856ff-1df0-09db-21a8-886c79c8647e@amsat.org> (raw)
In-Reply-To: <20200630090351.1247703-24-armbru@redhat.com>
On 6/30/20 11:03 AM, Markus Armbruster wrote:
> 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.
>
> aspeed_soc_ast2600_realize() and aspeed_soc_realize() are wrong that
> way: they pass &err to object_property_set_int() 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: "Cédric Le Goater" <clg@kaod.org>
> Cc: Peter Maydell <peter.maydell@linaro.org>
> Cc: Andrew Jeffery <andrew@aj.id.au>
> Cc: Joel Stanley <joel@jms.id.au>
> Cc: qemu-arm@nongnu.org
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> hw/arm/aspeed_ast2600.c | 5 +++--
> hw/arm/aspeed_soc.c | 5 +++--
> 2 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c
> index 4efac02e2b..59a7a1370b 100644
> --- a/hw/arm/aspeed_ast2600.c
> +++ b/hw/arm/aspeed_ast2600.c
> @@ -383,7 +383,8 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp)
> for (i = 0; i < sc->spis_num; i++) {
> object_property_set_link(OBJECT(&s->spi[i]), OBJECT(s->dram_mr),
> "dram", &error_abort);
> - object_property_set_int(OBJECT(&s->spi[i]), 1, "num-cs", &err);
> + object_property_set_int(OBJECT(&s->spi[i]), 1, "num-cs",
> + &error_abort);
> sysbus_realize(SYS_BUS_DEVICE(&s->spi[i]), &err);
> if (err) {
> error_propagate(errp, err);
> @@ -434,7 +435,7 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp)
> /* Net */
> for (i = 0; i < sc->macs_num; i++) {
> object_property_set_bool(OBJECT(&s->ftgmac100[i]), true, "aspeed",
> - &err);
> + &error_abort);
> sysbus_realize(SYS_BUS_DEVICE(&s->ftgmac100[i]), &err);
> if (err) {
> error_propagate(errp, err);
> diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c
> index 03b91bade6..311458aa76 100644
> --- a/hw/arm/aspeed_soc.c
> +++ b/hw/arm/aspeed_soc.c
> @@ -333,7 +333,8 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp)
>
> /* SPI */
> for (i = 0; i < sc->spis_num; i++) {
> - object_property_set_int(OBJECT(&s->spi[i]), 1, "num-cs", &err);
> + object_property_set_int(OBJECT(&s->spi[i]), 1, "num-cs",
> + &error_abort);
> sysbus_realize(SYS_BUS_DEVICE(&s->spi[i]), &err);
> if (err) {
> error_propagate(errp, err);
> @@ -384,7 +385,7 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp)
> /* Net */
> for (i = 0; i < sc->macs_num; i++) {
> object_property_set_bool(OBJECT(&s->ftgmac100[i]), true, "aspeed",
> - &err);
> + &error_abort);
> sysbus_realize(SYS_BUS_DEVICE(&s->ftgmac100[i]), &err);
> if (err) {
> error_propagate(errp, err);
>
next prev parent reply other threads:[~2020-06-30 9:25 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é [this message]
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 ` [PATCH v3 25/26] arm/{bcm2835, fsl-imx25, fsl-imx6}: Fix realize error API violations Markus Armbruster
2020-06-30 9:12 ` [PATCH v3 25/26] arm/{bcm2835,fsl-imx25,fsl-imx6}: " 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=ebd856ff-1df0-09db-21a8-886c79c8647e@amsat.org \
--to=f4bug@amsat.org \
--cc=andrew@aj.id.au \
--cc=armbru@redhat.com \
--cc=clg@kaod.org \
--cc=joel@jms.id.au \
--cc=peter.maydell@linaro.org \
--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).