]> xenbits.xensource.com Git - libvirt.git/commitdiff
virFDStream: close also given errfd (fd leak)
authorMarc-André Lureau <marcandre.lureau@gmail.com>
Thu, 13 Oct 2011 11:47:58 +0000 (13:47 +0200)
committerEric Blake <eblake@redhat.com>
Thu, 13 Oct 2011 18:09:48 +0000 (12:09 -0600)
In virFDStreamOpenFileInternal(), a errfd pipe is opened by
virCommandRunAsync() and given to virFDStreamOpenInternal().

It seems virFDStream should close errfd, just like the other
fd it is given.

This fixes screenshots leaking FDs:
http://bugzilla.redhat.com/show_bug.cgi?id=745761

src/fdstream.c

index b60162c6a148c4f297b32ab56bd4c1f8f2b4cc70..841f979ddb651598ec0caa5c43748b08835694a4 100644 (file)
@@ -268,6 +268,10 @@ virFDStreamClose(virStreamPtr st)
         virCommandFree(fdst->cmd);
         fdst->cmd = NULL;
     }
+
+    if (VIR_CLOSE(fdst->errfd) < 0)
+        VIR_DEBUG("ignoring failed close on fd %d", fdst->errfd);
+
     st->privateData = NULL;
 
     if (fdst->dispatching) {