Skip to content

Commit 851e99e

Browse files
committed
tracefs: Set the group ownership in apply_options() not parse_options()
Al Viro brought it to my attention that the dentries may not be filled when the parse_options() is called, causing the call to set_gid() to possibly crash. It should only be called if parse_options() succeeds totally anyway. He suggested the logical place to do the update is in apply_options(). Link: https://lore.kernel.org/all/20220225165219.737025658@goodmis.org/ Link: https://lkml.kernel.org/r/20220225153426.1c4cab6b@gandalf.local.home Cc: stable@vger.kernel.org Acked-by: Al Viro <viro@zeniv.linux.org.uk> Reported-by: Al Viro <viro@zeniv.linux.org.uk> Fixes: 48b27b6 ("tracefs: Set all files to the same group ownership as the mount option") Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
1 parent dd99035 commit 851e99e

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

fs/tracefs/inode.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,6 @@ static int tracefs_parse_options(char *data, struct tracefs_mount_opts *opts)
264264
if (!gid_valid(gid))
265265
return -EINVAL;
266266
opts->gid = gid;
267-
set_gid(tracefs_mount->mnt_root, gid);
268267
break;
269268
case Opt_mode:
270269
if (match_octal(&args[0], &option))
@@ -291,7 +290,9 @@ static int tracefs_apply_options(struct super_block *sb)
291290
inode->i_mode |= opts->mode;
292291

293292
inode->i_uid = opts->uid;
294-
inode->i_gid = opts->gid;
293+
294+
/* Set all the group ids to the mount option */
295+
set_gid(sb->s_root, opts->gid);
295296

296297
return 0;
297298
}

0 commit comments

Comments
 (0)