[Xen-changelog] [xen stable-4.2] xend: fix file descriptor leak in pci utilities

[patchbot@xxxxxxx]

commit 0605de0e2db799b30d3f93490132ba916034b289
Author:     Xi Xiong <xixiong@xxxxxxxxxx>
AuthorDate: Thu Sep 12 11:28:03 2013 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Sep 12 11:28:03 2013 +0200

    xend: fix file descriptor leak in pci utilities
    
    A file descriptor leak was detected after creating multiple domUs with
    pass-through PCI devices. This patch fixes the issue.
    
    Signed-off-by: Xi Xiong <xixiong@xxxxxxxxxx>
    Reviewed-by: Matt Wilson <msw@xxxxxxxxxx>
    [msw: adjusted commit message]
    Signed-off-by: Matt Wilson <msw@xxxxxxxxxx>
    master commit: 749019afca4fd002d36856bad002cc11f7d0ddda
    master date: 2013-09-03 16:36:52 +0100
---
 tools/python/xen/util/pci.py |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/tools/python/xen/util/pci.py b/tools/python/xen/util/pci.py
index 307144c..adeca4b 100644
--- a/tools/python/xen/util/pci.py
+++ b/tools/python/xen/util/pci.py
@@ -969,18 +969,22 @@ class PciDevice:
         ttl = 480; # 3840 bytes, minimum 8 bytes per capability
         pos = 0x100
 
+        fd = None
         try:
             fd = os.open(path, os.O_RDONLY)
             os.lseek(fd, pos, 0)
             h = os.read(fd, 4)
             if len(h) == 0: # MMCONF is not enabled?
+                os.close(fd)
                 return 0
             header = struct.unpack('I', h)[0]
             if header == 0 or header == -1:
+                os.close(fd)
                 return 0
 
             while ttl > 0:
                 if (header & 0x0000ffff) == cap:
+                    os.close(fd)
                     return pos
                 pos = (header >> 20) & 0xffc
                 if pos < 0x100:
@@ -990,6 +994,8 @@ class PciDevice:
                 ttl = ttl - 1
             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 0
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.2

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