| Message ID | 20181204132952.2601-4-peter.maydell@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | arm: five simple memory leak fixes | expand |
On 12/4/18 7:29 AM, Peter Maydell wrote: > 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> > --- > hw/sd/sdhci.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On 4/12/18 14:29, Peter Maydell wrote: > 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. Oops > > 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(). Thanks for the cleanup! > > Spotted by clang's leak sanitizer. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/sd/sdhci.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c > index 81bbf032794..83f1574ffdc 100644 > --- a/hw/sd/sdhci.c > +++ b/hw/sd/sdhci.c > @@ -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); > } > >
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 81bbf032794..83f1574ffdc 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -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); }
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> --- hw/sd/sdhci.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) -- 2.19.2