From: Richard Jones <rjones@redhat.com>
Date: Fri, 27 Aug 2010 14:27:22 +0000 (+0100)
Subject: daemon: Set O_CLOEXEC flag on the virtio-serial file descriptor.
X-Git-Tag: 1.5.6~2
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=d89a88d67e577ee6111820cb44c3440b7772608d;p=libguestfs.git

daemon: Set O_CLOEXEC flag on the virtio-serial file descriptor.
---

diff --git a/daemon/guestfsd.c b/daemon/guestfsd.c
index 8130524..e398b7d 100644
--- a/daemon/guestfsd.c
+++ b/daemon/guestfsd.c
@@ -60,6 +60,11 @@ static char *read_cmdline (void);
 # define MAX(a,b) ((a)>(b)?(a):(b))
 #endif
 
+/* Not the end of the world if this open flag is not defined. */
+#ifndef O_CLOEXEC
+# define O_CLOEXEC 0
+#endif
+
 /* If root device is an ext2 filesystem, this is the major and minor.
  * This is so we can ignore this device from the point of view of the
  * user, eg. in guestfs_list_devices and many other places.
@@ -237,7 +242,8 @@ main (int argc, char *argv[])
 #endif
 
   /* Connect to virtio-serial channel. */
-  int sock = open ("/dev/virtio-ports/org.libguestfs.channel.0", O_RDWR);
+  int sock = open ("/dev/virtio-ports/org.libguestfs.channel.0",
+                   O_RDWR | O_CLOEXEC);
   if (sock == -1) {
     fprintf (stderr,
              "\n"