OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

virtiofsd: Parse flag FUSE_WRITE_KILL_PRIV

Browse Source 
Caller can set FUSE_WRITE_KILL_PRIV in write_flags. Parse it and pass it
to the filesystem.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Reviewed-by: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Vivek Goyal 2019-08-13 15:29:42 -04:00 committed by Dr. David Alan Gilbert
parent 4f8bde99c1
commit f779bc5265
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/virtiofsd/fuse_common.h
View File

@ -93,8 +93,12 @@ struct fuse_file_info {
*/ */
unsigned int cache_readdir:1; unsigned int cache_readdir:1;
/* Indicates that suid/sgid bits should be removed upon write */
unsigned int kill_priv:1;
/** Padding. Reserved for future use*/ /** Padding. Reserved for future use*/
unsigned int padding:25; unsigned int padding:24;
unsigned int padding2:32; unsigned int padding2:32;
/* /*

4
tools/virtiofsd/fuse_lowlevel.c
View File

@ -1142,6 +1142,7 @@ static void do_write(fuse_req_t req, fuse_ino_t nodeid,
memset(&fi, 0, sizeof(fi)); memset(&fi, 0, sizeof(fi));
fi.fh = arg->fh; fi.fh = arg->fh;
fi.writepage = (arg->write_flags & FUSE_WRITE_CACHE) != 0; fi.writepage = (arg->write_flags & FUSE_WRITE_CACHE) != 0;
fi.kill_priv = !!(arg->write_flags & FUSE_WRITE_KILL_PRIV);
fi.lock_owner = arg->lock_owner; fi.lock_owner = arg->lock_owner;
fi.flags = arg->flags; fi.flags = arg->flags;
@ -1177,7 +1178,8 @@ static void do_write_buf(fuse_req_t req, fuse_ino_t nodeid,
fi.lock_owner = arg->lock_owner; fi.lock_owner = arg->lock_owner;
fi.flags = arg->flags; fi.flags = arg->flags;
fi.fh = arg->fh; fi.fh = arg->fh;
fi.writepage = arg->write_flags & FUSE_WRITE_CACHE; fi.writepage = !!(arg->write_flags & FUSE_WRITE_CACHE);
fi.kill_priv = !!(arg->write_flags & FUSE_WRITE_KILL_PRIV);
if (ibufv->count == 1) { if (ibufv->count == 1) {
assert(!(tmpbufv.buf[0].flags & FUSE_BUF_IS_FD)); assert(!(tmpbufv.buf[0].flags & FUSE_BUF_IS_FD));