[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 1/2] hw/arm/xlnx-zynqmp.c: Avoid memory leak in error-return
From: |
Alistair Francis |
Subject: |
Re: [PATCH 1/2] hw/arm/xlnx-zynqmp.c: Avoid memory leak in error-return path |
Date: |
Tue, 24 Mar 2020 08:55:58 -0700 |
On Tue, Mar 24, 2020 at 6:50 AM Peter Maydell <address@hidden> wrote:
>
> In xlnx_zynqmp_realize() if the attempt to realize the SD
> controller object fails then the error-return path will leak
> the 'bus_name' string. Fix this by deferring the allocation
> until after the realize has succeeded.
>
> Fixes: Coverity CID 1421911
> Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Alistair
> ---
> hw/arm/xlnx-zynqmp.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c
> index 49f1c8d0de2..a13dbeeacec 100644
> --- a/hw/arm/xlnx-zynqmp.c
> +++ b/hw/arm/xlnx-zynqmp.c
> @@ -520,7 +520,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error
> **errp)
> sysbus_connect_irq(SYS_BUS_DEVICE(&s->sata), 0, gic_spi[SATA_INTR]);
>
> for (i = 0; i < XLNX_ZYNQMP_NUM_SDHCI; i++) {
> - char *bus_name = g_strdup_printf("sd-bus%d", i);
> + char *bus_name;
> SysBusDevice *sbd = SYS_BUS_DEVICE(&s->sdhci[i]);
> Object *sdhci = OBJECT(&s->sdhci[i]);
>
> @@ -541,6 +541,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error
> **errp)
> sysbus_connect_irq(sbd, 0, gic_spi[sdhci_intr[i]]);
>
> /* Alias controller SD bus to the SoC itself */
> + bus_name = g_strdup_printf("sd-bus%d", i);
> object_property_add_alias(OBJECT(s), bus_name, sdhci, "sd-bus",
> &error_abort);
> g_free(bus_name);
> --
> 2.20.1
>
>