Commit d710e1e7 authored by Li Qiang's avatar Li Qiang Committed by Gerd Hoffmann
Browse files

usb: ehci: fix memory leak in ehci 



In usb_ehci_init function, it initializes 's->ipacket', but there
is no corresponding function to free this. As the ehci can be hotplug
and unplug, this will leak host memory leak. In order to make the
hierarchy clean, we should add a ehci pci finalize function, then call
the clean function in ehci device.

Signed-off-by: default avatarLi Qiang <liqiang6-s@360.cn>
Message-id: 589a85b8.3c2b9d0a.b8e6.1434@mx.google.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 56f9e46b

hw/usb/hcd-ehci-pci.c

+9 −0
Original line number Diff line number Diff line
@@ -89,6 +89,14 @@ static void usb_ehci_pci_init(Object *obj) 
    usb_ehci_init(s, DEVICE(obj));

}



static void usb_ehci_pci_finalize(Object *obj)

{

    EHCIPCIState *i = PCI_EHCI(obj);

    EHCIState *s = &i->ehci;



    usb_ehci_finalize(s);

}



static void usb_ehci_pci_exit(PCIDevice *dev)

{

    EHCIPCIState *i = PCI_EHCI(dev);
@@ -159,6 +167,7 @@ static const TypeInfo ehci_pci_type_info = { 
    .parent = TYPE_PCI_DEVICE,

    .instance_size = sizeof(EHCIPCIState),

    .instance_init = usb_ehci_pci_init,

    .instance_finalize = usb_ehci_pci_finalize,

    .abstract = true,

    .class_init = ehci_class_init,

};

hw/usb/hcd-ehci.c

+5 −0
Original line number Diff line number Diff line
@@ -2545,6 +2545,11 @@ void usb_ehci_init(EHCIState *s, DeviceState *dev) 
                                &s->mem_ports);

}



void usb_ehci_finalize(EHCIState *s)

{

    usb_packet_cleanup(&s->ipacket);

}



/*

 * vim: expandtab ts=4

 */

hw/usb/hcd-ehci.h

+1 −0
Original line number Diff line number Diff line
@@ -323,6 +323,7 @@ struct EHCIState { 
extern const VMStateDescription vmstate_ehci;



void usb_ehci_init(EHCIState *s, DeviceState *dev);

void usb_ehci_finalize(EHCIState *s);

void usb_ehci_realize(EHCIState *s, DeviceState *dev, Error **errp);

void usb_ehci_unrealize(EHCIState *s, DeviceState *dev, Error **errp);

void ehci_reset(void *opaque);