[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 23/26] aspeed: Fix realize error API violation
From: |
Markus Armbruster |
Subject: |
[PATCH v3 23/26] aspeed: Fix realize error API violation |
Date: |
Tue, 30 Jun 2020 11:03:48 +0200 |
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>
---
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);
--
2.26.2
- [PATCH v3 17/26] riscv/sifive_u: Fix sifive_u_soc_realize() error API violations, (continued)
- [PATCH v3 17/26] riscv/sifive_u: Fix sifive_u_soc_realize() error API violations, Markus Armbruster, 2020/06/30
- [PATCH v3 19/26] mips/cps: Fix mips_cps_realize() error API violations, Markus Armbruster, 2020/06/30
- [PATCH v3 18/26] riscv_hart: Fix riscv_harts_realize() error API violations, Markus Armbruster, 2020/06/30
- [PATCH v3 25/26] arm/{bcm2835, fsl-imx25, fsl-imx6}: Fix realize error API violations, Markus Armbruster, 2020/06/30
- [PATCH v3 11/26] vnc: Plug minor memory leak in vnc_display_open(), Markus Armbruster, 2020/06/30
- [PATCH v3 02/26] pci: Delete useless error_propagate(), Markus Armbruster, 2020/06/30
- [PATCH v3 15/26] hw: Fix error API violation around object_property_set_link(), Markus Armbruster, 2020/06/30
- [PATCH v3 21/26] amd_iommu: Fix amdvi_realize() error API violation, Markus Armbruster, 2020/06/30
- [PATCH v3 23/26] aspeed: Fix realize error API violation,
Markus Armbruster <=
- [PATCH v3 01/26] net/virtio: Fix failover_replug_primary() return value regression, Markus Armbruster, 2020/06/30