Commit c0983085 authored Dec 14, 2018 by Peter Maydell

hw/sd/sdhci: Don't leak memory region in sdhci_sysbus_realize()



In sdhci_sysbus_realize() we override the initialization of
s->iomem that sdhci_common_realize() performs. However we
don't destroy the old memory region before reinitializing
it, which means that the memory allocated for mr->name in
memory_region_do_init() is leaked.

Since sdhci_initfn() already initializes s->io_ops to
&sdhci_mmio_ops, always use that in sdhci_common_realize()
and remove the now-unnecessary reinitialization of the
MMIO region from sdhci_sysbus_realize().

Spotted by clang's leak sanitizer.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20181204132952.2601-4-peter.maydell@linaro.org

parent 7081e9b6

hw/sd/sdhci.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -1371,7 +1371,7 @@ static void sdhci_common_realize(SDHCIState s, Error *errp)
		s->buf_maxsz = sdhci_get_fifolen(s);
		s->fifo_buffer = g_malloc0(s->buf_maxsz);

		memory_region_init_io(&s->iomem, OBJECT(s), &sdhci_mmio_ops, s, "sdhci",
		memory_region_init_io(&s->iomem, OBJECT(s), s->io_ops, s, "sdhci",
		SDHC_REGISTERS_MAP_SIZE);
		}

		@@ -1565,9 +1565,6 @@ static void sdhci_sysbus_realize(DeviceState dev, Error * errp)

		sysbus_init_irq(sbd, &s->irq);

		memory_region_init_io(&s->iomem, OBJECT(s), s->io_ops, s, "sdhci",
		SDHC_REGISTERS_MAP_SIZE);

		sysbus_init_mmio(sbd, &s->iomem);
		}