Skip to content

Commit 2da6e36

Browse files
philmdkraxel
authored andcommitted
hw/usb/hcd-ehci-sysbus: Free USBPacket on instance finalize()
When building with --enable-sanitizers we get: Direct leak of 32 byte(s) in 2 object(s) allocated from: #0 0x5618479ec7cf in malloc (qemu-system-aarch64+0x233b7cf) #1 0x7f675745f958 in g_malloc (/lib64/libglib-2.0.so.0+0x58958) qemu#2 0x561847f02ca2 in usb_packet_init hw/usb/core.c:531:5 qemu#3 0x561848df4df4 in usb_ehci_init hw/usb/hcd-ehci.c:2575:5 qemu#4 0x561847c119ac in ehci_sysbus_init hw/usb/hcd-ehci-sysbus.c:73:5 qemu#5 0x56184a5bdab8 in object_init_with_type qom/object.c:375:9 qemu#6 0x56184a5bd955 in object_init_with_type qom/object.c:371:9 qemu#7 0x56184a5a2bda in object_initialize_with_type qom/object.c:517:5 qemu#8 0x56184a5a24d5 in object_initialize qom/object.c:536:5 qemu#9 0x56184a5a2f6c in object_initialize_child_with_propsv qom/object.c:566:5 qemu#10 0x56184a5a2e60 in object_initialize_child_with_props qom/object.c:549:10 qemu#11 0x56184a5a3a1e in object_initialize_child_internal qom/object.c:603:5 qemu#12 0x561849542d18 in npcm7xx_init hw/arm/npcm7xx.c:427:5 Similarly to commit d710e1e ("usb: ehci: fix memory leak in ehci"), fix by calling usb_ehci_finalize() to free the USBPacket. Fixes: 7341ea0 Signed-off-by: Philippe Mathieu-Daudé <[email protected]> Reviewed-by: Thomas Huth <[email protected]> Message-Id: <[email protected]> Signed-off-by: Gerd Hoffmann <[email protected]>
1 parent 59be75e commit 2da6e36

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

hw/usb/hcd-ehci-sysbus.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,14 @@ static void ehci_sysbus_init(Object *obj)
7474
sysbus_init_mmio(d, &s->mem);
7575
}
7676

77+
static void ehci_sysbus_finalize(Object *obj)
78+
{
79+
EHCISysBusState *i = SYS_BUS_EHCI(obj);
80+
EHCIState *s = &i->ehci;
81+
82+
usb_ehci_finalize(s);
83+
}
84+
7785
static void ehci_sysbus_class_init(ObjectClass *klass, void *data)
7886
{
7987
DeviceClass *dc = DEVICE_CLASS(klass);
@@ -94,6 +102,7 @@ static const TypeInfo ehci_type_info = {
94102
.parent = TYPE_SYS_BUS_DEVICE,
95103
.instance_size = sizeof(EHCISysBusState),
96104
.instance_init = ehci_sysbus_init,
105+
.instance_finalize = ehci_sysbus_finalize,
97106
.abstract = true,
98107
.class_init = ehci_sysbus_class_init,
99108
.class_size = sizeof(SysBusEHCIClass),

0 commit comments

Comments
 (0)