aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/mount.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d6f9e8..8b37e09 100644
--- 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 d7ba571..cb5d190 100644
--- 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;
}