aboutsummaryrefslogtreecommitdiffstats
path: root/include/uapi/linux
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@redhat.com>2016-10-01 01:32:32 -0400
committerMiklos Szeredi <mszeredi@redhat.com>2016-10-01 01:32:32 -0400
commit5e940c1dd3c1f7561924954eecee956ec277a79b (patch)
treeab6e949c24c553e4e0b6d10782f4993c1cd436da /include/uapi/linux
parenta09f99eddef44035ec764075a37bace8181bec38 (diff)
fuse: handle killpriv in userspace fs
Only userspace filesystem can do the killing of suid/sgid without races. So introduce an INIT flag and negotiate support for this. Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'include/uapi/linux')
-rw-r--r--include/uapi/linux/fuse.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h
index 27e17363263a..14ca2f10d354 100644
--- a/include/uapi/linux/fuse.h
+++ b/include/uapi/linux/fuse.h
@@ -108,6 +108,9 @@
108 * 108 *
109 * 7.25 109 * 7.25
110 * - add FUSE_PARALLEL_DIROPS 110 * - add FUSE_PARALLEL_DIROPS
111 *
112 * 7.26
113 * - add FUSE_HANDLE_KILLPRIV
111 */ 114 */
112 115
113#ifndef _LINUX_FUSE_H 116#ifndef _LINUX_FUSE_H
@@ -143,7 +146,7 @@
143#define FUSE_KERNEL_VERSION 7 146#define FUSE_KERNEL_VERSION 7
144 147
145/** Minor version number of this interface */ 148/** Minor version number of this interface */
146#define FUSE_KERNEL_MINOR_VERSION 25 149#define FUSE_KERNEL_MINOR_VERSION 26
147 150
148/** The node ID of the root inode */ 151/** The node ID of the root inode */
149#define FUSE_ROOT_ID 1 152#define FUSE_ROOT_ID 1
@@ -238,6 +241,7 @@ struct fuse_file_lock {
238 * FUSE_WRITEBACK_CACHE: use writeback cache for buffered writes 241 * FUSE_WRITEBACK_CACHE: use writeback cache for buffered writes
239 * FUSE_NO_OPEN_SUPPORT: kernel supports zero-message opens 242 * FUSE_NO_OPEN_SUPPORT: kernel supports zero-message opens
240 * FUSE_PARALLEL_DIROPS: allow parallel lookups and readdir 243 * FUSE_PARALLEL_DIROPS: allow parallel lookups and readdir
244 * FUSE_HANDLE_KILLPRIV: fs handles killing suid/sgid/cap on write/chown/trunc
241 */ 245 */
242#define FUSE_ASYNC_READ (1 << 0) 246#define FUSE_ASYNC_READ (1 << 0)
243#define FUSE_POSIX_LOCKS (1 << 1) 247#define FUSE_POSIX_LOCKS (1 << 1)
@@ -258,6 +262,7 @@ struct fuse_file_lock {
258#define FUSE_WRITEBACK_CACHE (1 << 16) 262#define FUSE_WRITEBACK_CACHE (1 << 16)
259#define FUSE_NO_OPEN_SUPPORT (1 << 17) 263#define FUSE_NO_OPEN_SUPPORT (1 << 17)
260#define FUSE_PARALLEL_DIROPS (1 << 18) 264#define FUSE_PARALLEL_DIROPS (1 << 18)
265#define FUSE_HANDLE_KILLPRIV (1 << 19)
261 266
262/** 267/**
263 * CUSE INIT request/reply flags 268 * CUSE INIT request/reply flags