Skip to content

Commit e8368d1

Browse files
devnexenrostedt
authored andcommitted
tracefs: Fix default permissions not being applied on initial mount
Commit e4d3214 ("tracing: Fix tracefs mount options") moved the option application from tracefs_fill_super() to tracefs_reconfigure() called from tracefs_get_tree(). This fixed mount options being ignored on user-space mounts when the superblock already exists, but introduced a regression for the initial kernel-internal mount. On the first mount (via simple_pin_fs during init), sget_fc() transfers fc->s_fs_info to sb->s_fs_info and sets fc->s_fs_info to NULL. When tracefs_get_tree() then calls tracefs_reconfigure(), it sees a NULL fc->s_fs_info and returns early without applying any options. The root inode keeps mode 0755 from simple_fill_super() instead of the intended TRACEFS_DEFAULT_MODE (0700). Furthermore, even on subsequent user-space mounts without an explicit mode= option, tracefs_apply_options(sb, true) gates the mode behind fsi->opts & BIT(Opt_mode), which is unset for the defaults. So the mode is never corrected unless the user explicitly passes mode=0700. Restore the tracefs_apply_options(sb, false) call in tracefs_fill_super() to apply default permissions on initial superblock creation, matching what debugfs does in debugfs_fill_super(). Cc: [email protected] Fixes: e4d3214 ("tracing: Fix tracefs mount options") Link: https://patch.msgid.link/[email protected] Signed-off-by: David Carlier <[email protected]> Signed-off-by: Steven Rostedt (Google) <[email protected]>
1 parent 676540d commit e8368d1

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

fs/tracefs/inode.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,7 @@ static int tracefs_fill_super(struct super_block *sb, struct fs_context *fc)
468468
return err;
469469

470470
sb->s_op = &tracefs_super_operations;
471+
tracefs_apply_options(sb, false);
471472
set_default_d_op(sb, &tracefs_dentry_operations);
472473

473474
return 0;

0 commit comments

Comments
 (0)