[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v3 24/26] hw/arm/armsse: Fix armsse_realize() error API viola
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [PATCH v3 24/26] hw/arm/armsse: Fix armsse_realize() error API violation |
Date: |
Tue, 30 Jun 2020 11:11:50 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 |
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.
>
> armsse_realize() is wrong that way: it passes &err to
> object_property_set_int() multiple times 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: qemu-arm@nongnu.org
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> hw/arm/armsse.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c
> index c73cc6badf..e2cf43ee0b 100644
> --- a/hw/arm/armsse.c
> +++ b/hw/arm/armsse.c
> @@ -991,13 +991,13 @@ static void armsse_realize(DeviceState *dev, Error
> **errp)
> sysbus_mmio_map(SYS_BUS_DEVICE(&s->sysinfo), 0, 0x40020000);
> /* System control registers */
> object_property_set_int(OBJECT(&s->sysctl), info->sys_version,
> - "SYS_VERSION", &err);
> + "SYS_VERSION", &error_abort);
> object_property_set_int(OBJECT(&s->sysctl), info->cpuwait_rst,
> - "CPUWAIT_RST", &err);
> + "CPUWAIT_RST", &error_abort);
> object_property_set_int(OBJECT(&s->sysctl), s->init_svtor,
> - "INITSVTOR0_RST", &err);
> + "INITSVTOR0_RST", &error_abort);
> object_property_set_int(OBJECT(&s->sysctl), s->init_svtor,
> - "INITSVTOR1_RST", &err);
> + "INITSVTOR1_RST", &error_abort);
> sysbus_realize(SYS_BUS_DEVICE(&s->sysctl), &err);
> if (err) {
> error_propagate(errp, err);
>
- Re: [PATCH v3 03/26] Clean up some calls to ignore Error objects the right way, (continued)
- [PATCH v3 22/26] arm/stm32f205 arm/stm32f405: Fix realize error API violation, Markus Armbruster, 2020/06/30
- [PATCH v3 20/26] x86: Fix x86_cpu_new() error handling, Markus Armbruster, 2020/06/30
- [PATCH v3 06/26] usb/dev-mtp: Fix Error double free after inotify failure, Markus Armbruster, 2020/06/30
- [PATCH v3 26/26] migration/rdma: Plug memory leaks in qemu_rdma_registration_stop(), Markus Armbruster, 2020/06/30
- [PATCH v3 16/26] hw/arm: Drop useless object_property_set_link() error handling, Markus Armbruster, 2020/06/30
- [PATCH v3 24/26] hw/arm/armsse: Fix armsse_realize() error API violation, Markus Armbruster, 2020/06/30
- Re: [PATCH v3 24/26] hw/arm/armsse: Fix armsse_realize() error API violation,
Philippe Mathieu-Daudé <=
- [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