Merge branch 'support/osxfuse-3'

osxfuse · Aug 8, 2016 · 88c2916 · 88c2916
2 parents 03c5c25 + 175a3e6
commit 88c2916
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 3 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -17,18 +17,23 @@ CUSE has been written by Tejun Heo <teheo@suse.de>. Furthermore, the
 following people have contributed patches (autogenerated list):
 
 Anatol Pomozov <anatol.pomozov@gmail.com>
+Antonio SJ Musumeci <trapexit@spawn.link>
 Christopher Harrison <ch12@sanger.ac.uk>
 Csaba Henk <csaba.henk@creo.hu>
 cvs2git <>
 Dalvik Khertel <khertel@outlook.com>
 Daniel Thau <danthau@bedrocklinux.org>
 David McNab <david@rebirthing.co.nz>
+David Sheets <sheets@alum.mit.edu>
 Emmanuel Dreyfus <manu@netbsd.org>
 Enke Chen <enkechen@yahoo.com>
+Eric Engestrom <eric@engestrom.ch>
 Eric Wong <normalperson@yhbt.net>
 Fabrice Bauzac <fbauzac@amadeus.com>
 Feng Shuo <steve.shuo.feng@gmail.com>
+Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
 Ikey Doherty <michael.i.doherty@intel.com>
+Jan Blumschein <jan@jan-blumschein.de>
 Joachim Schiele <joachim.schiele@daimler.com>
 Joachim Schiele <js@lastlog.de>
 John Muir <john@jmuir.com>
@@ -48,6 +53,7 @@ Reuben Hawkins <reubenhwk@gmail.com>
 Richard W.M. Jones <rjones@redhat.com>
 Riku Voipio <riku.voipio@linaro.org>
 Roland Bauerschmidt <rb@debian.org>
+Sam Stuewe <halosghost@archlinux.info>
 Sebastian Pipping <sebastian@pipping.org>
 therealneworld@gmail.com <therealneworld@gmail.com>
 Winfried Koehler <w_scan@gmx-topmail.de>
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+FUSE 2.9.7 (2016-06-20)
+=======================
+
+* Added SELinux support.
+* Fixed race-condition when session is terminated right after starting
+  a FUSE file system.
+
 FUSE 2.9.6 (2016-04-23)
 =======================
 

diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(fuse, 2.9.6)
+AC_INIT(fuse, 2.9.7)
 
 AC_PREREQ(2.59d)
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/lib/Makefile.am b/lib/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-fuse_version_number=2:9:6
+fuse_version_number=2:9:7
 
 AUTOMAKE_OPTIONS = subdir-objects
 AM_CPPFLAGS = -I$(top_srcdir)/include -DFUSERMOUNT_DIR=\"$(bindir)\" \

diff --git a/lib/helper.c b/lib/helper.c
@@ -211,6 +211,13 @@ int fuse_daemonize(int foreground)
 {
 	if (!foreground) {
 		int nullfd;
+		int waiter[2];
+		char completed;
+
+		if (pipe(waiter)) {
+			perror("fuse_daemonize: pipe");
+			return -1;
+		}
 
 		/*
 		 * demonize current process by forking it and killing the
@@ -223,6 +230,7 @@ int fuse_daemonize(int foreground)
 		case 0:
 			break;
 		default:
+			read(waiter[0], &completed, sizeof(completed));
 			_exit(0);
 		}
 
@@ -242,6 +250,12 @@ int fuse_daemonize(int foreground)
 				close(nullfd);
 		}
 
+		/* Propagate completion of daemon initializatation */
+		completed = 1;
+		write(waiter[1], &completed, sizeof(completed));
+		close(waiter[0]);
+		close(waiter[1]);
+
 #ifdef __APPLE__
 		did_daemonize = 1;
 #endif

diff --git a/lib/mount.c b/lib/mount.c
@@ -98,6 +98,10 @@ static const struct fuse_opt fuse_mount_opts[] = {
 	FUSE_OPT_KEY("large_read",		KEY_KERN_OPT),
 	FUSE_OPT_KEY("blksize=",		KEY_KERN_OPT),
 	FUSE_OPT_KEY("default_permissions",	KEY_KERN_OPT),
+	FUSE_OPT_KEY("context=",		KEY_KERN_OPT),
+	FUSE_OPT_KEY("fscontext=",		KEY_KERN_OPT),
+	FUSE_OPT_KEY("defcontext=",		KEY_KERN_OPT),
+	FUSE_OPT_KEY("rootcontext=",		KEY_KERN_OPT),
 	FUSE_OPT_KEY("max_read=",		KEY_KERN_OPT),
 	FUSE_OPT_KEY("max_read=",		FUSE_OPT_KEY_KEEP),
 	FUSE_OPT_KEY("user=",			KEY_MTAB_OPT),

diff --git a/util/ulockmgr_server.c b/util/ulockmgr_server.c
@@ -92,7 +92,7 @@ static int receive_message(int sock, void *buf, size_t buflen, int *fdp,
 
 	cmsg = CMSG_FIRSTHDR(&msg);
 	if (cmsg) {
-		if (!cmsg->cmsg_type == SCM_RIGHTS) {
+		if (cmsg->cmsg_type != SCM_RIGHTS) {
 			fprintf(stderr,
 				"ulockmgr_server: unknown control message %d\n",
 				cmsg->cmsg_type);