Re: [PATCH v3 25/26] arm/{bcm2835,fsl-imx25,fsl-imx6}: Fix realize error API violations

[Philippe Mathieu-Daudé]

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.
> 
> bcm2835_peripherals_realize(), fsl_imx25_realize() and
> fsl_imx6_realize() are wrong that way: they pass &err to
> object_property_set_uint() 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: Peter Maydell <peter.maydell@linaro.org>
> Cc: Andrew Baumann <Andrew.Baumann@microsoft.com>
> Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>
> Cc: Jean-Christophe Dubois <jcd@tribudubois.net>
> Cc: qemu-arm@nongnu.org
> Signed-off-by: Markus Armbruster <armbru@redhat.com>

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

> ---
>  hw/arm/bcm2835_peripherals.c | 12 ++++--------
>  hw/arm/fsl-imx25.c           | 12 +++++-------
>  hw/arm/fsl-imx6.c            | 12 +++++-------
>  3 files changed, 14 insertions(+), 22 deletions(-)
> 
> diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c
> index 1e975d7eec..7ffdf62067 100644
> --- a/hw/arm/bcm2835_peripherals.c
> +++ b/hw/arm/bcm2835_peripherals.c
> @@ -283,16 +283,12 @@ static void bcm2835_peripherals_realize(DeviceState 
> *dev, Error **errp)
>       * For the exact details please refer to the Arasan documentation:
>       *   SD3.0_Host_AHB_eMMC4.4_Usersguide_ver5.9_jan11_10.pdf
>       */
> -    object_property_set_uint(OBJECT(&s->sdhci), 3, "sd-spec-version", &err);
> +    object_property_set_uint(OBJECT(&s->sdhci), 3, "sd-spec-version",
> +                             &error_abort);
>      object_property_set_uint(OBJECT(&s->sdhci), BCM2835_SDHC_CAPAREG, 
> "capareg",
> -                             &err);
> +                             &error_abort);
>      object_property_set_bool(OBJECT(&s->sdhci), true, "pending-insert-quirk",
> -                             &err);
> -    if (err) {
> -        error_propagate(errp, err);
> -        return;
> -    }
> -
> +                             &error_abort);
>      sysbus_realize(SYS_BUS_DEVICE(&s->sdhci), &err);
>      if (err) {
>          error_propagate(errp, err);
> diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c
> index f32f9bce0f..7ab5c98fbe 100644
> --- a/hw/arm/fsl-imx25.c
> +++ b/hw/arm/fsl-imx25.c
> @@ -260,15 +260,13 @@ static void fsl_imx25_realize(DeviceState *dev, Error 
> **errp)
>          };
>  
>          object_property_set_uint(OBJECT(&s->esdhc[i]), 2, "sd-spec-version",
> -                                 &err);
> +                                 &error_abort);
>          object_property_set_uint(OBJECT(&s->esdhc[i]), 
> IMX25_ESDHC_CAPABILITIES,
> -                                 "capareg", &err);
> +                                 "capareg",
> +                                 &error_abort);
>          object_property_set_uint(OBJECT(&s->esdhc[i]), SDHCI_VENDOR_IMX,
> -                                 "vendor", &err);
> -        if (err) {
> -            error_propagate(errp, err);
> -            return;
> -        }
> +                                 "vendor",
> +                                 &error_abort);
>          sysbus_realize(SYS_BUS_DEVICE(&s->esdhc[i]), &err);
>          if (err) {
>              error_propagate(errp, err);
> diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c
> index d4bc4fae93..4ae3c3efc2 100644
> --- a/hw/arm/fsl-imx6.c
> +++ b/hw/arm/fsl-imx6.c
> @@ -336,15 +336,13 @@ static void fsl_imx6_realize(DeviceState *dev, Error 
> **errp)
>  
>          /* UHS-I SDIO3.0 SDR104 1.8V ADMA */
>          object_property_set_uint(OBJECT(&s->esdhc[i]), 3, "sd-spec-version",
> -                                 &err);
> +                                 &error_abort);
>          object_property_set_uint(OBJECT(&s->esdhc[i]), 
> IMX6_ESDHC_CAPABILITIES,
> -                                 "capareg", &err);
> +                                 "capareg",
> +                                 &error_abort);
>          object_property_set_uint(OBJECT(&s->esdhc[i]), SDHCI_VENDOR_IMX,
> -                                 "vendor", &err);
> -        if (err) {
> -            error_propagate(errp, err);
> -            return;
> -        }
> +                                 "vendor",
> +                                 &error_abort);
>          sysbus_realize(SYS_BUS_DEVICE(&s->esdhc[i]), &err);
>          if (err) {
>              error_propagate(errp, err);
>