[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 22/25] arm/stm32f205 arm/stm32f405: Fix realize error API viol
From: |
Markus Armbruster |
Subject: |
[PATCH v2 22/25] arm/stm32f205 arm/stm32f405: Fix realize error API violation |
Date: |
Wed, 24 Jun 2020 10:37:34 +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.
stm32f205_soc_realize() and stm32f405_soc_realize() are wrong that
way: they pass &err to object_property_set_int() without checking it,
and then to qdev_realize(). Harmless, because the former can't
actually fail here.
Fix by passing &error_abort instead.
Cc: Alistair Francis <alistair@alistair23.me>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/arm/stm32f205_soc.c | 2 +-
hw/arm/stm32f405_soc.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c
index 19487544f0..56aef686c9 100644
--- a/hw/arm/stm32f205_soc.c
+++ b/hw/arm/stm32f205_soc.c
@@ -154,7 +154,7 @@ static void stm32f205_soc_realize(DeviceState *dev_soc,
Error **errp)
/* ADC 1 to 3 */
object_property_set_int(OBJECT(s->adc_irqs), STM_NUM_ADCS,
- "num-lines", &err);
+ "num-lines", &error_abort);
qdev_realize(DEVICE(s->adc_irqs), NULL, &err);
if (err != NULL) {
error_propagate(errp, err);
diff --git a/hw/arm/stm32f405_soc.c b/hw/arm/stm32f405_soc.c
index c12d9f999d..cf9228d8e7 100644
--- a/hw/arm/stm32f405_soc.c
+++ b/hw/arm/stm32f405_soc.c
@@ -172,7 +172,7 @@ static void stm32f405_soc_realize(DeviceState *dev_soc,
Error **errp)
return;
}
object_property_set_int(OBJECT(&s->adc_irqs), STM_NUM_ADCS,
- "num-lines", &err);
+ "num-lines", &error_abort);
qdev_realize(DEVICE(&s->adc_irqs), NULL, &err);
if (err != NULL) {
error_propagate(errp, err);
--
2.26.2
- Re: [PATCH v2 20/25] x86: Fix x86_cpu_new() error API violations, (continued)
- [PATCH v2 06/25] usb/dev-mtp: Fix Error double free after inotify failure, Markus Armbruster, 2020/06/24
- [PATCH v2 17/25] riscv/sifive_u: Fix sifive_u_soc_realize() error API violations, Markus Armbruster, 2020/06/24
- [PATCH v2 19/25] mips/cps: Fix mips_cps_realize() error API violations, Markus Armbruster, 2020/06/24
- [PATCH v2 02/25] pci: Delete useless error_propagate(), Markus Armbruster, 2020/06/24
- [PATCH v2 01/25] net/virtio: Fix failover_replug_primary() return value regression, Markus Armbruster, 2020/06/24
- [PATCH v2 18/25] riscv_hart: Fix riscv_harts_realize() error API violations, Markus Armbruster, 2020/06/24
- [PATCH v2 11/25] vnc: Plug minor memory leak in vnc_display_open(), Markus Armbruster, 2020/06/24
- [PATCH v2 23/25] aspeed: Fix realize error API violation, Markus Armbruster, 2020/06/24
- [PATCH v2 25/25] arm/{bcm2835, fsl-imx25, fsl-imx6}: Fix realize error API violations, Markus Armbruster, 2020/06/24
- [PATCH v2 22/25] arm/stm32f205 arm/stm32f405: Fix realize error API violation,
Markus Armbruster <=
- [PATCH v2 24/25] hw/arm/armsse: Fix armsse_realize() error API violation, Markus Armbruster, 2020/06/24
- [PATCH v2 21/25] amd_iommu: Fix amdvi_realize() error API violation, Markus Armbruster, 2020/06/24
- [PATCH v2 16/25] hw/arm: Drop useless object_property_set_link() error handling, Markus Armbruster, 2020/06/24
- [PATCH v2 15/25] hw: Fix error API violation around object_property_set_link(), Markus Armbruster, 2020/06/24