OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

dm: usb: fix possible memory leak 

fix possible memory leak for usb.

Tracked-On: #2704
Signed-off-by: Conghui Chen <conghui.chen@intel.com>
Reviewed-by: Yuan Liu <yuan1.liu@intel.com>
Reviewed-by: Yonghua Huang <yonghua.huang@intel.com>
This commit is contained in:
Conghui Chen 2019-03-12 07:17:32 +08:00 committed by wenlingz
parent 694fca9c06
commit 7ab6e7ea03
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
devicemodel/hw/pci/xhci.c
View File

@ -4012,8 +4012,8 @@ errout:
for (i = 1; i <= XHCI_MAX_DEVS && xdev->devices[i]; i++)
free(xdev->devices[i]);
xdev->ndevices = 0;
xdev->devices = NULL;
free(xdev->devices);
xdev->devices = NULL;
}
if (xdev->slots) {
free(xdev->slots);
@ -4170,7 +4170,21 @@ pci_xhci_init(struct vmctx *ctx, struct pci_vdev *dev, char *opts)
done:
if (error) {
UPRINTF(LFTL, "%s fail, error=%d\n", __func__, error);
free(xdev);
if (xdev) {
if (xdev->devices) {
free(xdev->devices);
xdev->devices = NULL;
}
if (xdev->slots) {
free(xdev->slots);
xdev->slots = NULL;
}
if (xdev->portregs) {
free(xdev->portregs);
xdev->portregs = NULL;
}
free(xdev);
}
}
return error;

5
devicemodel/hw/platform/usb_pmapper.c
View File

@ -857,6 +857,11 @@ usb_dev_data(void *pdata, struct usb_data_xfer *xfer, int dir, int epctx)
} else {
UPRINTF(LFTL, "%s: wrong endpoint type %d\r\n", __func__, type);
if (req->buffer)
free(req->buffer);
if (req->libusb_xfer)
libusb_free_transfer(req->libusb_xfer);
free(req);
xfer->status = USB_ERR_INVAL;
}