[PATCH] xend: fix open file descriptor leak

[Kouya Shimura <kouya@jp.fujitsu.com>]

[-- Attachment #1: message body text --]
[-- Type: text/plain, Size: 153 bytes --]

I got the following error:

$ xm pci-list-assignable-devices
Error: [Errno 24] Too many open files

Signed-off-by: Kouya Shimura <kouya@jp.fujitsu.com>


[-- Attachment #2: xend_fd_leak.patch --]
[-- Type: text/x-patch, Size: 907 bytes --]

diff -r d1631540bcc4 tools/python/xen/util/pci.py
--- a/tools/python/xen/util/pci.py	Tue Jan 18 17:23:24 2011 +0000
+++ b/tools/python/xen/util/pci.py	Thu Jan 20 13:08:11 2011 +0900
@@ -922,10 +922,12 @@ class PciDevice:
         pos = PCI_CAPABILITY_LIST
 
         try:
+            fd = None
             fd = os.open(path, os.O_RDONLY)
             os.lseek(fd, PCI_STATUS, 0)
             status = struct.unpack('H', os.read(fd, 2))[0]
             if (status & 0x10) == 0:
+                os.close(fd)
                 # The device doesn't support PCI_STATUS_CAP_LIST
                 return 0
 
@@ -952,6 +954,8 @@ class PciDevice:
 
             os.close(fd)
         except OSError, (errno, strerr):
+            if fd is not None:
+                os.close(fd)
             raise PciDeviceParseError(('Error when accessing sysfs: %s (%d)' %
                 (strerr, errno)))
         return pos

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel