1. Patchew
  2. QEMU
  3. [PATCH v3 00/26] Error handling fixes & cleanups
  4. View patch

[PATCH v3 22/26] arm/stm32f205 arm/stm32f405: Fix realize error API violation

Markus Armbruster posted 26 patches 5 years, 7 months ago
Maintainers: Palmer Dabbelt <palmer@dabbelt.com>, Alistair Francis <Alistair.Francis@wdc.com>, Gerd Hoffmann <kraxel@redhat.com>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Paolo Bonzini <pbonzini@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Kevin Wolf <kwolf@redhat.com>, Max Reitz <mreitz@redhat.com>, Christian Schoenebeck <qemu_oss@crudebyte.com>, Alistair Francis <alistair@alistair23.me>, Eric Auger <eric.auger@redhat.com>, David Gibson <david@gibson.dropbear.id.au>, Juan Quintela <quintela@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>, Xie Changlong <xiechanglong.d@gmail.com>, Aurelien Jarno <aurelien@aurel32.net>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, Eduardo Habkost <ehabkost@redhat.com>, Wen Congyang <wencongyang2@huawei.com>, Markus Armbruster <armbru@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, Sagar Karandikar <sagark@eecs.berkeley.edu>, Jason Wang <jasowang@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, Greg Kurz <groug@kaod.org>, Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>, Peter Maydell <peter.maydell@linaro.org>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Richard Henderson <rth@twiddle.net>, Michael Roth <mdroth@linux.vnet.ibm.com>, Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
[PATCH v3 22/26] arm/stm32f205 arm/stm32f405: Fix realize error API violation
Posted by Markus Armbruster 5 years, 7 months ago 
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>
Reviewed-by: Alistair Francis <alistair.francis@wdc.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 v3 22/26] arm/stm32f205 arm/stm32f405: Fix realize error API violation
Posted by Philippe Mathieu-Daudé 5 years, 7 months ago 
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.
> 
> 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>
> Reviewed-by: Alistair Francis <alistair.francis@wdc.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);

qdev_realize() coult take &error_abort too then.

Anyway:
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

>      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);
>
Re: [PATCH v3 22/26] arm/stm32f205 arm/stm32f405: Fix realize error API violation
Posted by Markus Armbruster 5 years, 7 months ago 
Philippe Mathieu-Daudé <f4bug@amsat.org> writes:

> 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.
>> 
>> 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>
>> Reviewed-by: Alistair Francis <alistair.francis@wdc.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);
>
> qdev_realize() coult take &error_abort too then.

Think so.  I went for the minimal patch.

> Anyway:
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Thanks!

>>      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);
>>

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.