Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be16d365 authored by Steven Rostedt (Google)'s avatar Steven Rostedt (Google) Committed by Greg Kroah-Hartman
Browse files

tracefs: Set the group ownership in apply_options() not parse_options() 

commit 851e99ebeec3f4a672bb5010cf1ece095acee447 upstream.

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: default avatarAl Viro <viro@zeniv.linux.org.uk>
Reported-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Fixes: 48b27b6b5191 ("tracefs: Set all files to the same group ownership as the mount option")
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ebc465e8

fs/tracefs/inode.c

+3 −2
Original line number Diff line number Diff line
@@ -265,7 +265,6 @@ static int tracefs_parse_options(char *data, struct tracefs_mount_opts *opts) 
			if (!gid_valid(gid))

				return -EINVAL;

			opts->gid = gid;

			set_gid(tracefs_mount->mnt_root, gid);

			break;

		case Opt_mode:

			if (match_octal(&args[0], &option))
@@ -292,7 +291,9 @@ static int tracefs_apply_options(struct super_block *sb) 
	inode->i_mode |= opts->mode;



	inode->i_uid = opts->uid;

	inode->i_gid = opts->gid;



	/* Set all the group ids to the mount option */

	set_gid(sb->s_root, opts->gid);



	return 0;

}