From: "Steven Rostedt (VMware)" <[email protected]>
If the tracefs system is set to a specific owner and group, then the files
and directories that are created under them should inherit the owner and
group of the parent.
Cc: [email protected]
Fixes: 4282d60689d4f ("tracefs: Add new tracefs file system")
Reported-by: Kalesh Singh <[email protected]>
Reported: https://lore.kernel.org/all/CAC_TJve8MMAv+H_NdLSJXZUSoxOEq2zB_pVaJ9p=7H6Bu3X76g@mail.gmail.com/
Signed-off-by: Steven Rostedt (VMware) <[email protected]>
---
fs/tracefs/inode.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/fs/tracefs/inode.c b/fs/tracefs/inode.c
index f20f575cdaef..6b16d89cf187 100644
--- a/fs/tracefs/inode.c
+++ b/fs/tracefs/inode.c
@@ -488,6 +488,8 @@ struct dentry *tracefs_create_file(const char *name, umode_t mode,
inode->i_mode = mode;
inode->i_fop = fops ? fops : &tracefs_file_operations;
inode->i_private = data;
+ inode->i_uid = dentry->d_parent->d_inode->i_uid;
+ inode->i_gid = dentry->d_parent->d_inode->i_gid;
d_instantiate(dentry, inode);
fsnotify_create(dentry->d_parent->d_inode, dentry);
return end_creating(dentry);
@@ -510,6 +512,8 @@ static struct dentry *__create_dir(const char *name, struct dentry *parent,
inode->i_mode = S_IFDIR | S_IRWXU | S_IRUSR| S_IRGRP | S_IXUSR | S_IXGRP;
inode->i_op = ops;
inode->i_fop = &simple_dir_operations;
+ inode->i_uid = dentry->d_parent->d_inode->i_uid;
+ inode->i_gid = dentry->d_parent->d_inode->i_gid;
/* directory inodes start off with i_nlink == 2 (for "." entry) */
inc_nlink(inode);
--
2.31.1
On Tue, Dec 07, 2021 at 02:48:28PM -0500, Steven Rostedt wrote:
> From: "Steven Rostedt (VMware)" <[email protected]>
>
> If the tracefs system is set to a specific owner and group, then the files
> and directories that are created under them should inherit the owner and
> group of the parent.
The description reads like the owner of new directories and files is to
be always taken from the {g,u}id mount options. It doesn't look like
tracefs currently supports .setattr but if it ever wants to e.g. to
allow the system administrator to delegate specific directories or
files, the patch below will cause inheritance based on directory
ownership not on the {g,u}id mount option. So if I were to write this
I'd rather initialize based on mount option directly.
So sm along the - completely untested, non-prettified - lines of:
static inline struct tracefs_fs_info *TRACEFS_SB(const struct super_block *sb)
{
return sb->s_fs_info;
}
struct tracefs_info *info;
[...]
inode = tracefs_get_inode(dentry->d_sb);
if (unlikely(!inode))
return failed_creating(dentry);
[...]
struct tracefs_info *info = TRACEFS_SB(inode->i_sb);
[...]
inode->i_uid = info.mount_opts.uid;
inode->i_gid = info.mount_opts.gid;
this clearly gets the semantics across, the caller doens't need to know
that parent can be NULL and why it is retrieved via dentry->d_parent,
and is robust even if you allow changes in ownership in different ways
later on.
>
> Cc: [email protected]
> Fixes: 4282d60689d4f ("tracefs: Add new tracefs file system")
> Reported-by: Kalesh Singh <[email protected]>
> Reported: https://lore.kernel.org/all/CAC_TJve8MMAv+H_NdLSJXZUSoxOEq2zB_pVaJ9p=7H6Bu3X76g@mail.gmail.com/
> Signed-off-by: Steven Rostedt (VMware) <[email protected]>
> ---
> fs/tracefs/inode.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/fs/tracefs/inode.c b/fs/tracefs/inode.c
> index f20f575cdaef..6b16d89cf187 100644
> --- a/fs/tracefs/inode.c
> +++ b/fs/tracefs/inode.c
> @@ -488,6 +488,8 @@ struct dentry *tracefs_create_file(const char *name, umode_t mode,
> inode->i_mode = mode;
> inode->i_fop = fops ? fops : &tracefs_file_operations;
> inode->i_private = data;
> + inode->i_uid = dentry->d_parent->d_inode->i_uid;
> + inode->i_gid = dentry->d_parent->d_inode->i_gid;
I you stick with this I'd use the d_inode() accessor we have.
inode->i_uid = d_inode(dentry->d_parent)->i_uid;
inode->i_gid = d_inode(dentry->d_parent)->i_gid;
> d_instantiate(dentry, inode);
> fsnotify_create(dentry->d_parent->d_inode, dentry);
> return end_creating(dentry);
> @@ -510,6 +512,8 @@ static struct dentry *__create_dir(const char *name, struct dentry *parent,
> inode->i_mode = S_IFDIR | S_IRWXU | S_IRUSR| S_IRGRP | S_IXUSR | S_IXGRP;
> inode->i_op = ops;
> inode->i_fop = &simple_dir_operations;
> + inode->i_uid = dentry->d_parent->d_inode->i_uid;
> + inode->i_gid = dentry->d_parent->d_inode->i_gid;
>
> /* directory inodes start off with i_nlink == 2 (for "." entry) */
> inc_nlink(inode);
> --
> 2.31.1
>
On Wed, 8 Dec 2021 11:44:54 +0100
Christian Brauner <[email protected]> wrote:
> On Tue, Dec 07, 2021 at 02:48:28PM -0500, Steven Rostedt wrote:
> > From: "Steven Rostedt (VMware)" <[email protected]>
> >
> > If the tracefs system is set to a specific owner and group, then the files
> > and directories that are created under them should inherit the owner and
> > group of the parent.
>
> The description reads like the owner of new directories and files is to
> be always taken from the {g,u}id mount options. It doesn't look like
I'll reword it then, because, as it says, it inherits from the "parent". But
I see how you can misread it, as it's only a single sentence and talks
about mounting and setting ownership. I'll change that to:
If directories in tracefs have their ownership changed, then any new
files and directories that are created under those directories should
inherit the ownership of the director they are created in.
> tracefs currently supports .setattr but if it ever wants to e.g. to
> allow the system administrator to delegate specific directories or
> files, the patch below will cause inheritance based on directory
> ownership not on the {g,u}id mount option. So if I were to write this
> I'd rather initialize based on mount option directly.
The patch itself came after having all the directories and files change
their ownership to the mount option on mount, but it was reported that new
files and directories that were created after the mount were still owned by
root. I first looked at having new files and directories inherit the mount
option, but then thought that would be confusing if an admin changed the
ownership of the events directory, but the new events created under it
belonged to the same as the mount option. It makes a lot more sense to
inherit from the parent directory as that could change after it is mounted.
And as the directories group control files, it is best to have new options
for that control to have the same ownership.
>
> So sm along the - completely untested, non-prettified - lines of:
>
> static inline struct tracefs_fs_info *TRACEFS_SB(const struct super_block *sb)
> {
> return sb->s_fs_info;
> }
>
> struct tracefs_info *info;
> [...]
>
> inode = tracefs_get_inode(dentry->d_sb);
> if (unlikely(!inode))
> return failed_creating(dentry);
>
> [...]
>
> struct tracefs_info *info = TRACEFS_SB(inode->i_sb);
>
> [...]
>
> inode->i_uid = info.mount_opts.uid;
> inode->i_gid = info.mount_opts.gid;
>
> this clearly gets the semantics across, the caller doens't need to know
> that parent can be NULL and why it is retrieved via dentry->d_parent,
> and is robust even if you allow changes in ownership in different ways
> later on.
>
> >
> > Cc: [email protected]
> > Fixes: 4282d60689d4f ("tracefs: Add new tracefs file system")
> > Reported-by: Kalesh Singh <[email protected]>
> > Reported: https://lore.kernel.org/all/CAC_TJve8MMAv+H_NdLSJXZUSoxOEq2zB_pVaJ9p=7H6Bu3X76g@mail.gmail.com/
> > Signed-off-by: Steven Rostedt (VMware) <[email protected]>
> > ---
> > fs/tracefs/inode.c | 4 ++++
> > 1 file changed, 4 insertions(+)
> >
> > diff --git a/fs/tracefs/inode.c b/fs/tracefs/inode.c
> > index f20f575cdaef..6b16d89cf187 100644
> > --- a/fs/tracefs/inode.c
> > +++ b/fs/tracefs/inode.c
> > @@ -488,6 +488,8 @@ struct dentry *tracefs_create_file(const char *name, umode_t mode,
> > inode->i_mode = mode;
> > inode->i_fop = fops ? fops : &tracefs_file_operations;
> > inode->i_private = data;
> > + inode->i_uid = dentry->d_parent->d_inode->i_uid;
> > + inode->i_gid = dentry->d_parent->d_inode->i_gid;
>
> I you stick with this I'd use the d_inode() accessor we have.
>
> inode->i_uid = d_inode(dentry->d_parent)->i_uid;
> inode->i_gid = d_inode(dentry->d_parent)->i_gid;
I'll make this update. Thanks, I thought there was a better way to do this.
Thanks Christian for the review.
-- Steve
>
> > d_instantiate(dentry, inode);
> > fsnotify_create(dentry->d_parent->d_inode, dentry);
> > return end_creating(dentry);
> > @@ -510,6 +512,8 @@ static struct dentry *__create_dir(const char *name, struct dentry *parent,
> > inode->i_mode = S_IFDIR | S_IRWXU | S_IRUSR| S_IRGRP | S_IXUSR | S_IXGRP;
> > inode->i_op = ops;
> > inode->i_fop = &simple_dir_operations;
> > + inode->i_uid = dentry->d_parent->d_inode->i_uid;
> > + inode->i_gid = dentry->d_parent->d_inode->i_gid;
> >
> > /* directory inodes start off with i_nlink == 2 (for "." entry) */
> > inc_nlink(inode);
> > --
> > 2.31.1
> >