Add support for FUSE_CAP_HANDLE_KILLPRIV_V2

This just adds in the basic handler, but does not
use it yet in examples.

diff --git a/example/printcap.c b/example/printcap.c
index 30e20573167769b87314b161c4a0466583a35b8a..bbbc1b899ef06f5d5fbbe401498890f106db94ba 100644 (file)
--- a/example/printcap.c
+++ b/example/printcap.c
@@ -81,6 +81,14 @@ static void pc_init(void *userdata,
                        printf("\tFUSE_CAP_EXPLICIT_INVAL_DATA\n");
        if(conn->capable & FUSE_CAP_EXPIRE_ONLY)
                        printf("\tFUSE_CAP_EXPIRE_ONLY\n");
+       if(conn->capable & FUSE_CAP_SETXATTR_EXT)
+                       printf("\tFUSE_CAP_SETXATTR_EXT\n");
+       if(conn->capable & FUSE_CAP_HANDLE_KILLPRIV)
+                       printf("\tFUSE_CAP_HANDLE_KILLPRIV\n");
+       if(conn->capable & FUSE_CAP_HANDLE_KILLPRIV_V2)
+                       printf("\tFUSE_CAP_HANDLE_KILLPRIV_V2\n");
+       if(conn->capable & FUSE_CAP_DIRECT_IO_ALLOW_MMAP)
+                       printf("\tFUSE_CAP_DIRECT_IO_ALLOW_MMAP\n");
        fuse_session_exit(se);
 }
 

diff --git a/include/fuse_common.h b/include/fuse_common.h
index 52b691a5298c180034b4f5b5d78ca773eb6b7b54..f052b67ddb496b94fb7050e99e85a5045f610bfc 100644 (file)
--- a/include/fuse_common.h
+++ b/include/fuse_common.h
@@ -367,6 +367,23 @@ struct fuse_loop_config_v1 {
  */
 #define FUSE_CAP_HANDLE_KILLPRIV         (1 << 20)
 
+/**
+ * Indicates that the filesystem is responsible for unsetting
+ * setuid and setgid bit and additionally cap (stored as xattr) when a
+ * file is written, truncated, or its owner is changed.
+ * Upon write/truncate suid/sgid is only killed if caller
+ * does not have CAP_FSETID. Additionally upon
+ * write/truncate sgid is killed only if file has group
+ * execute permission. (Same as Linux VFS behavior).
+ * KILLPRIV_V2 requires handling of
+ *   - FUSE_OPEN_KILL_SUIDGID (set in struct fuse_create_in::open_flags)
+ *   - FATTR_KILL_SUIDGID (set in struct fuse_setattr_in::valid)
+ *   - FUSE_WRITE_KILL_SUIDGID (set in struct fuse_write_in::write_flags)
+ *
+ * This feature is disabled by default.
+ */
+#define FUSE_CAP_HANDLE_KILLPRIV_V2         (1 << 21)
+
 /**
  * Indicates that the kernel supports caching symlinks in its page cache.
  *

diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c
index 26e56995d4559eab4e25a4f5960b4e5dcd1bf3b2..d9844b01dbc5a1203fa801ba5323f4197f2efd4d 100644 (file)
--- a/lib/fuse_lowlevel.c
+++ b/lib/fuse_lowlevel.c
@@ -2001,6 +2001,8 @@ void do_init(fuse_req_t req, fuse_ino_t nodeid, const void *inarg)
                        se->conn.capable |= FUSE_CAP_POSIX_ACL;
                if (inargflags & FUSE_HANDLE_KILLPRIV)
                        se->conn.capable |= FUSE_CAP_HANDLE_KILLPRIV;
+               if (inargflags & FUSE_HANDLE_KILLPRIV_V2)
+                       se->conn.capable |= FUSE_CAP_HANDLE_KILLPRIV_V2;
                if (inargflags & FUSE_CACHE_SYMLINKS)
                        se->conn.capable |= FUSE_CAP_CACHE_SYMLINKS;
                if (inargflags & FUSE_NO_OPENDIR_SUPPORT)
@@ -2145,6 +2147,8 @@ void do_init(fuse_req_t req, fuse_ino_t nodeid, const void *inarg)
                outargflags |= FUSE_POSIX_ACL;
        if (se->conn.want & FUSE_CAP_HANDLE_KILLPRIV)
                outargflags |= FUSE_HANDLE_KILLPRIV;
+       if (se->conn.want & FUSE_CAP_HANDLE_KILLPRIV_V2)
+               outargflags |= FUSE_HANDLE_KILLPRIV_V2;
        if (se->conn.want & FUSE_CAP_CACHE_SYMLINKS)
                outargflags |= FUSE_CACHE_SYMLINKS;
        if (se->conn.want & FUSE_CAP_EXPLICIT_INVAL_DATA)