From: Vivek Goyal <vgoyal@redhat.com> To: linux-fsdevel@vger.kernel.org, miklos@szeredi.hu Cc: vgoyal@redhat.com, virtio-fs@redhat.com Subject: [PATCH 3/5] fuse: Add a flag FUSE_SETATTR_KILL_PRIV Date: Fri, 24 Jul 2020 14:38:10 -0400 [thread overview] Message-ID: <20200724183812.19573-4-vgoyal@redhat.com> (raw) In-Reply-To: <20200724183812.19573-1-vgoyal@redhat.com> With handle_killpriv_v2, server needs to kill suid/sgid on truncate (setattr) but it does not know if caller has CAP_FSETID or not. So like write, send killpriv information in fuse_setattr_in and add a flag FUSE_SETATTR_KILL_PRIV. Signed-off-by: Vivek Goyal <vgoyal@redhat.com> --- fs/fuse/dir.c | 11 ++++++++--- include/uapi/linux/fuse.h | 11 ++++++++++- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index 26f028bc760b..82747ca4c5c8 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -1437,13 +1437,15 @@ void fuse_release_nowrite(struct inode *inode) static void fuse_setattr_fill(struct fuse_conn *fc, struct fuse_args *args, struct inode *inode, struct fuse_setattr_in *inarg_p, - struct fuse_attr_out *outarg_p) + struct fuse_attr_out *outarg_p, + uint32_t setattr_flags) { args->opcode = FUSE_SETATTR; args->nodeid = get_node_id(inode); args->in_numargs = 1; args->in_args[0].size = sizeof(*inarg_p); args->in_args[0].value = inarg_p; + inarg_p->setattr_flags = setattr_flags; args->out_numargs = 1; args->out_args[0].size = sizeof(*outarg_p); args->out_args[0].value = outarg_p; @@ -1474,7 +1476,7 @@ int fuse_flush_times(struct inode *inode, struct fuse_file *ff) inarg.valid |= FATTR_FH; inarg.fh = ff->fh; } - fuse_setattr_fill(fc, &args, inode, &inarg, &outarg); + fuse_setattr_fill(fc, &args, inode, &inarg, &outarg, 0); return fuse_simple_request(fc, &args); } @@ -1501,6 +1503,7 @@ int fuse_do_setattr(struct dentry *dentry, struct iattr *attr, loff_t oldsize; int err; bool trust_local_cmtime = is_wb && S_ISREG(inode->i_mode); + uint32_t setattr_flags = 0; if (!fc->default_permissions) attr->ia_valid |= ATTR_FORCE; @@ -1529,6 +1532,8 @@ int fuse_do_setattr(struct dentry *dentry, struct iattr *attr, if (attr->ia_valid & ATTR_SIZE) { if (WARN_ON(!S_ISREG(inode->i_mode))) return -EIO; + if (fc->handle_killpriv_v2 && !capable(CAP_FSETID)) + setattr_flags |= FUSE_SETATTR_KILL_PRIV; is_truncate = true; } @@ -1565,7 +1570,7 @@ int fuse_do_setattr(struct dentry *dentry, struct iattr *attr, inarg.valid |= FATTR_LOCKOWNER; inarg.lock_owner = fuse_lock_owner_id(fc, current->files); } - fuse_setattr_fill(fc, &args, inode, &inarg, &outarg); + fuse_setattr_fill(fc, &args, inode, &inarg, &outarg, setattr_flags); err = fuse_simple_request(fc, &args); if (err) { if (err == -EINTR) diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h index 960ba8af5cf4..4b275653ac2e 100644 --- a/include/uapi/linux/fuse.h +++ b/include/uapi/linux/fuse.h @@ -173,6 +173,7 @@ * - add FUSE_SETUPMAPPING and FUSE_REMOVEMAPPING * - add map_alignment to fuse_init_out, add FUSE_MAP_ALIGNMENT flag * - add FUSE_HANDLE_KILLPRIV_V2 + * - add FUSE_SETATTR_KILL_PRIV */ #ifndef _LINUX_FUSE_H @@ -368,6 +369,14 @@ struct fuse_file_lock { */ #define FUSE_GETATTR_FH (1 << 0) +/** + * Setattr flags + * FUSE_SETATTR_KILL_PRIV: kill suid and sgid bits. sgid should be killed + * only if group execute bit (S_IXGRP) is set. Meant to be used together + * with FUSE_HANDLE_KILLPRIV_V2. + */ +#define FUSE_SETATTR_KILL_PRIV (1 << 0) + /** * Lock flags */ @@ -566,7 +575,7 @@ struct fuse_link_in { struct fuse_setattr_in { uint32_t valid; - uint32_t padding; + uint32_t setattr_flags; uint64_t fh; uint64_t size; uint64_t lock_owner; -- 2.25.4
WARNING: multiple messages have this Message-ID (diff)
From: Vivek Goyal <vgoyal@redhat.com> To: linux-fsdevel@vger.kernel.org, miklos@szeredi.hu Cc: virtio-fs@redhat.com, vgoyal@redhat.com Subject: [Virtio-fs] [PATCH 3/5] fuse: Add a flag FUSE_SETATTR_KILL_PRIV Date: Fri, 24 Jul 2020 14:38:10 -0400 [thread overview] Message-ID: <20200724183812.19573-4-vgoyal@redhat.com> (raw) In-Reply-To: <20200724183812.19573-1-vgoyal@redhat.com> With handle_killpriv_v2, server needs to kill suid/sgid on truncate (setattr) but it does not know if caller has CAP_FSETID or not. So like write, send killpriv information in fuse_setattr_in and add a flag FUSE_SETATTR_KILL_PRIV. Signed-off-by: Vivek Goyal <vgoyal@redhat.com> --- fs/fuse/dir.c | 11 ++++++++--- include/uapi/linux/fuse.h | 11 ++++++++++- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index 26f028bc760b..82747ca4c5c8 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -1437,13 +1437,15 @@ void fuse_release_nowrite(struct inode *inode) static void fuse_setattr_fill(struct fuse_conn *fc, struct fuse_args *args, struct inode *inode, struct fuse_setattr_in *inarg_p, - struct fuse_attr_out *outarg_p) + struct fuse_attr_out *outarg_p, + uint32_t setattr_flags) { args->opcode = FUSE_SETATTR; args->nodeid = get_node_id(inode); args->in_numargs = 1; args->in_args[0].size = sizeof(*inarg_p); args->in_args[0].value = inarg_p; + inarg_p->setattr_flags = setattr_flags; args->out_numargs = 1; args->out_args[0].size = sizeof(*outarg_p); args->out_args[0].value = outarg_p; @@ -1474,7 +1476,7 @@ int fuse_flush_times(struct inode *inode, struct fuse_file *ff) inarg.valid |= FATTR_FH; inarg.fh = ff->fh; } - fuse_setattr_fill(fc, &args, inode, &inarg, &outarg); + fuse_setattr_fill(fc, &args, inode, &inarg, &outarg, 0); return fuse_simple_request(fc, &args); } @@ -1501,6 +1503,7 @@ int fuse_do_setattr(struct dentry *dentry, struct iattr *attr, loff_t oldsize; int err; bool trust_local_cmtime = is_wb && S_ISREG(inode->i_mode); + uint32_t setattr_flags = 0; if (!fc->default_permissions) attr->ia_valid |= ATTR_FORCE; @@ -1529,6 +1532,8 @@ int fuse_do_setattr(struct dentry *dentry, struct iattr *attr, if (attr->ia_valid & ATTR_SIZE) { if (WARN_ON(!S_ISREG(inode->i_mode))) return -EIO; + if (fc->handle_killpriv_v2 && !capable(CAP_FSETID)) + setattr_flags |= FUSE_SETATTR_KILL_PRIV; is_truncate = true; } @@ -1565,7 +1570,7 @@ int fuse_do_setattr(struct dentry *dentry, struct iattr *attr, inarg.valid |= FATTR_LOCKOWNER; inarg.lock_owner = fuse_lock_owner_id(fc, current->files); } - fuse_setattr_fill(fc, &args, inode, &inarg, &outarg); + fuse_setattr_fill(fc, &args, inode, &inarg, &outarg, setattr_flags); err = fuse_simple_request(fc, &args); if (err) { if (err == -EINTR) diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h index 960ba8af5cf4..4b275653ac2e 100644 --- a/include/uapi/linux/fuse.h +++ b/include/uapi/linux/fuse.h @@ -173,6 +173,7 @@ * - add FUSE_SETUPMAPPING and FUSE_REMOVEMAPPING * - add map_alignment to fuse_init_out, add FUSE_MAP_ALIGNMENT flag * - add FUSE_HANDLE_KILLPRIV_V2 + * - add FUSE_SETATTR_KILL_PRIV */ #ifndef _LINUX_FUSE_H @@ -368,6 +369,14 @@ struct fuse_file_lock { */ #define FUSE_GETATTR_FH (1 << 0) +/** + * Setattr flags + * FUSE_SETATTR_KILL_PRIV: kill suid and sgid bits. sgid should be killed + * only if group execute bit (S_IXGRP) is set. Meant to be used together + * with FUSE_HANDLE_KILLPRIV_V2. + */ +#define FUSE_SETATTR_KILL_PRIV (1 << 0) + /** * Lock flags */ @@ -566,7 +575,7 @@ struct fuse_link_in { struct fuse_setattr_in { uint32_t valid; - uint32_t padding; + uint32_t setattr_flags; uint64_t fh; uint64_t size; uint64_t lock_owner; -- 2.25.4
next prev parent reply other threads:[~2020-07-24 18:38 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-07-24 18:38 [RFC PATCH 0/5] fuse: Implement FUSE_HANDLE_KILLPRIV_V2 and enable SB_NOSEC Vivek Goyal 2020-07-24 18:38 ` [Virtio-fs] " Vivek Goyal 2020-07-24 18:38 ` [PATCH 1/5] fuse: Introduce the notion of FUSE_HANDLE_KILLPRIV_V2 Vivek Goyal 2020-07-24 18:38 ` [Virtio-fs] " Vivek Goyal 2020-07-24 18:38 ` [PATCH 2/5] fuse: Set FUSE_WRITE_KILL_PRIV in cached write path Vivek Goyal 2020-07-24 18:38 ` [Virtio-fs] " Vivek Goyal 2020-07-24 18:38 ` Vivek Goyal [this message] 2020-07-24 18:38 ` [Virtio-fs] [PATCH 3/5] fuse: Add a flag FUSE_SETATTR_KILL_PRIV Vivek Goyal 2020-08-21 14:53 ` Miklos Szeredi 2020-08-21 14:53 ` [Virtio-fs] " Miklos Szeredi 2020-08-21 20:56 ` Vivek Goyal 2020-08-21 20:56 ` [Virtio-fs] " Vivek Goyal 2020-07-24 18:38 ` [PATCH 4/5] fuse: For sending setattr in case of open(O_TRUNC) Vivek Goyal 2020-07-24 18:38 ` [Virtio-fs] " Vivek Goyal 2020-08-21 15:05 ` Miklos Szeredi 2020-08-21 15:05 ` [Virtio-fs] " Miklos Szeredi 2020-08-21 20:59 ` Vivek Goyal 2020-08-21 20:59 ` [Virtio-fs] " Vivek Goyal 2020-07-24 18:38 ` [PATCH 5/5] virtiofs: Support SB_NOSEC flag to improve direct write performance Vivek Goyal 2020-07-24 18:38 ` [Virtio-fs] " Vivek Goyal 2020-08-21 14:46 ` [RFC PATCH 0/5] fuse: Implement FUSE_HANDLE_KILLPRIV_V2 and enable SB_NOSEC Miklos Szeredi 2020-08-21 14:46 ` [Virtio-fs] " Miklos Szeredi 2020-08-21 20:02 ` Vivek Goyal 2020-08-21 20:02 ` [Virtio-fs] " Vivek Goyal 2020-08-24 8:43 ` Miklos Szeredi 2020-08-24 8:43 ` [Virtio-fs] " Miklos Szeredi
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200724183812.19573-4-vgoyal@redhat.com \ --to=vgoyal@redhat.com \ --cc=linux-fsdevel@vger.kernel.org \ --cc=miklos@szeredi.hu \ --cc=virtio-fs@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.