From d89a88d67e577ee6111820cb44c3440b7772608d Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Fri, 27 Aug 2010 15:27:22 +0100 Subject: [PATCH] daemon: Set O_CLOEXEC flag on the virtio-serial file descriptor. --- daemon/guestfsd.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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" -- 1.8.3.1