[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [5509] Keep usb host scanning from leaking file descriptors
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [5509] Keep usb host scanning from leaking file descriptors |
Date: |
Tue, 21 Oct 2008 16:34:20 +0000 |
Revision: 5509
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5509
Author: aliguori
Date: 2008-10-21 16:34:20 +0000 (Tue, 21 Oct 2008)
Log Message:
-----------
Keep usb host scanning from leaking file descriptors
If the first case does not succeed, then the usb scanning code will leak file
descriptors on every scan.
Modified Paths:
--------------
trunk/usb-linux.c
Modified: trunk/usb-linux.c
===================================================================
--- trunk/usb-linux.c 2008-10-21 16:31:31 UTC (rev 5508)
+++ trunk/usb-linux.c 2008-10-21 16:34:20 UTC (rev 5509)
@@ -1276,27 +1276,31 @@
usb_fs_type = USB_FS_PROC;
fclose(f);
dprintf(opened, USBPROCBUS_PATH, devices);
+ goto found_devices;
}
/* try additional methods if an access method hasn't been found yet */
f = fopen(USBDEVBUS_PATH "/devices", "r");
- if (!usb_fs_type && f) {
+ if (f) {
/* devices found in /dev/bus/usb/ */
strcpy(devpath, USBDEVBUS_PATH);
usb_fs_type = USB_FS_DEV;
fclose(f);
dprintf(opened, USBDEVBUS_PATH, devices);
+ goto found_devices;
}
dir = opendir(USBSYSBUS_PATH "/devices");
- if (!usb_fs_type && dir) {
+ if (dir) {
/* devices found in /dev/bus/usb/ (yes - not a mistake!) */
strcpy(devpath, USBDEVBUS_PATH);
usb_fs_type = USB_FS_SYS;
closedir(dir);
dprintf(opened, USBSYSBUS_PATH, devices);
+ goto found_devices;
}
+ found_devices:
if (!usb_fs_type) {
term_printf("husb: unable to access USB devices\n");
- goto the_end;
+ return -ENOENT;
}
/* the module setting (used later for opening devices) */
@@ -1307,7 +1311,7 @@
} else {
/* out of memory? */
perror("husb: unable to allocate memory for device path");
- goto the_end;
+ return -ENOMEM;
}
}
@@ -1319,8 +1323,10 @@
case USB_FS_SYS:
ret = usb_host_scan_sys(opaque, func);
break;
+ default:
+ ret = -EINVAL;
+ break;
}
- the_end:
return ret;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [5509] Keep usb host scanning from leaking file descriptors,
Anthony Liguori <=