d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix possible memory leaks of devinfo.

Browse Source 
PR: 108719
Submitted by: Antoine Brodin
This commit is contained in:
Warner Losh 2007-02-03 16:38:32 +00:00
parent 881c241ce3
commit f254d5b0d1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/usb/usb_subr.c
View File

@ -817,7 +817,6 @@ usbd_probe_and_attach(device_t parent, usbd_device_handle dev,
usbd_interface_handle ifaces[256]; /* 256 is the absolute max */
char *devinfo;
#if defined(__FreeBSD__)
/* XXX FreeBSD may leak resources on failure cases -- fixme */
device_t bdev;
struct usb_attach_arg *uaap;
@ -839,7 +838,6 @@ usbd_probe_and_attach(device_t parent, usbd_device_handle dev,
return (USBD_INVAL);
}
device_set_ivars(bdev, uaap);
#endif
uaa.device = dev;
uaa.iface = NULL;
uaa.ifaces = NULL;
@ -944,6 +942,7 @@ usbd_probe_and_attach(device_t parent, usbd_device_handle dev,
}
uaap = malloc(sizeof(uaa), M_USB, M_NOWAIT);
if (uaap == NULL) {
free(devinfo, M_USB);
return (USBD_NOMEM);
}
device_set_ivars(bdev, uaap);
@ -987,6 +986,7 @@ usbd_probe_and_attach(device_t parent, usbd_device_handle dev,
*uaap = uaa;
usbd_devinfo(dev, 1, devinfo);
device_set_desc_copy(bdev, devinfo);
free(devinfo, M_USB);
dv = USB_DO_ATTACH(dev, bdev, parent, &uaa, usbd_print, usbd_submatch);
if (dv != NULL)
return (USBD_NORMAL_COMPLETION);