Commit 7cd1c981 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

arm/{bcm2835,fsl-imx25,fsl-imx6}: Fix realize error API violations 



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: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <20200630090351.1247703-26-armbru@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
parent 17d5d49a

hw/arm/bcm2835_peripherals.c

+4 −8
Original line number Diff line number Diff line
@@ -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);

hw/arm/fsl-imx25.c

+5 −7
Original line number Diff line number Diff line
@@ -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);

hw/arm/fsl-imx6.c

+5 −7
Original line number Diff line number Diff line
@@ -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);