[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 19/22] hw/sd/sdhci: Don't leak memory region in sdhci
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 19/22] hw/sd/sdhci: Don't leak memory region in sdhci_sysbus_realize() |
Date: |
Fri, 14 Dec 2018 14:42:11 +0000 |
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 <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
---
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);
}
--
2.19.2
- [Qemu-devel] [PULL 03/22] Rename cpu_physical_memory_write_rom() to address_space_write_rom(), (continued)
- [Qemu-devel] [PULL 03/22] Rename cpu_physical_memory_write_rom() to address_space_write_rom(), Peter Maydell, 2018/12/14
- [Qemu-devel] [PULL 07/22] hw/ppc/mac_newworld, mac_oldworld: Don't use load_image(), Peter Maydell, 2018/12/14
- [Qemu-devel] [PULL 09/22] hw/smbios/smbios.c: Don't use load_image(), Peter Maydell, 2018/12/14
- [Qemu-devel] [PULL 08/22] hw/ppc/ppc405_boards: Don't use load_image(), Peter Maydell, 2018/12/14
- [Qemu-devel] [PULL 11/22] hw/i386/pc.c: Don't use load_image(), Peter Maydell, 2018/12/14
- [Qemu-devel] [PULL 10/22] hw/pci/pci.c: Don't use load_image(), Peter Maydell, 2018/12/14
- [Qemu-devel] [PULL 12/22] hw/i386/multiboot.c: Don't use load_image(), Peter Maydell, 2018/12/14
- [Qemu-devel] [PULL 13/22] hw/block/tc58128.c: Don't use load_image(), Peter Maydell, 2018/12/14
- [Qemu-devel] [PULL 14/22] device_tree.c: Don't use load_image(), Peter Maydell, 2018/12/14
- [Qemu-devel] [PULL 15/22] hw/core/loader.c: Remove load_image(), Peter Maydell, 2018/12/14
- [Qemu-devel] [PULL 19/22] hw/sd/sdhci: Don't leak memory region in sdhci_sysbus_realize(),
Peter Maydell <=
- [Qemu-devel] [PULL 17/22] target/arm: Free name string in ARMCPRegInfo hashtable entries, Peter Maydell, 2018/12/14
- [Qemu-devel] [PULL 16/22] include/hw/loader.h: Document load_image_size(), Peter Maydell, 2018/12/14
- [Qemu-devel] [PULL 21/22] target/arm: Create timers in realize, not init, Peter Maydell, 2018/12/14
- [Qemu-devel] [PULL 22/22] virt: Fix broken indentation, Peter Maydell, 2018/12/14
- [Qemu-devel] [PULL 18/22] hw/arm/mps2-tz.c: Free mscname string in make_dma(), Peter Maydell, 2018/12/14
- [Qemu-devel] [PULL 20/22] tests/test-arm-mptimer: Don't leak string memory, Peter Maydell, 2018/12/14
- Re: [Qemu-devel] [PULL 00/22] misc queue, Peter Maydell, 2018/12/16
- Re: [Qemu-devel] [PULL 00/22] misc queue, Peter Maydell, 2018/12/16
- Re: [Qemu-devel] [PULL 00/22] misc queue, no-reply, 2018/12/23