libfuse: set FD_CLOEXEC also when receiving device fd from fusermount

diff --git a/ChangeLog b/ChangeLog
index 1d6f9e8094f606ad32d2b03b09478852d933a74d..8b37e099e0112c739b3bee791130bac1e60ecc85 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-21  Miklos Szeredi <miklos@szeredi.hu>
+
+       * libfuse: set FD_CLOEXEC also when receiving device fd from
+       fusermount
+
 2013-06-20  Miklos Szeredi <miklos@szeredi.hu>
 
        * libfuse: fix multiple close of device fd.  Reported by Dan

diff --git a/lib/mount.c b/lib/mount.c
index d7ba57173ebdb2bce8c6069b11140f738e9dad71..cb5d1903f4a83261f3a8bba2ce464fc6ea76d483 100644 (file)
--- a/lib/mount.c
+++ b/lib/mount.c
@@ -404,6 +404,9 @@ static int fuse_mount_fusermount(const char *mountpoint, struct mount_opts *mo,
                waitpid(pid, NULL, 0); /* bury zombie */
        }
 
+       if (rv >= 0)
+               fcntl(rv, F_SETFD, FD_CLOEXEC);
+
        return rv;
 }