github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 14:04:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Revert "ANDROID: make sure proc mount options are applied"

Browse Source 
This reverts commit 1d92317c73 as it
should not be needed anymore with the recent changes in fa10fed30f
("proc: allow to mount many instances of proc in one pid namespace")

Cc: Todd Kjos <tkjos@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I3ddd939c081e0485ce3b46e4f6544d00cffad3dc
This commit is contained in:
Greg Kroah-Hartman 2020-06-23 09:35:02 +02:00
parent dfd0059142
commit 428ec716d3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/proc/root.c
View File

@ -77,7 +77,8 @@ static int proc_parse_param(struct fs_context *fc, struct fs_parameter *param)
return 0;
}
static void proc_apply_options(struct fs_context *fc,
static void proc_apply_options(struct super_block *s,
struct fs_context *fc,
struct pid_namespace *pid_ns,
struct user_namespace *user_ns)
{
@ -95,7 +96,7 @@ static int proc_fill_super(struct super_block *s, struct fs_context *fc)
struct inode *root_inode;
int ret;
proc_apply_options(fc, pid_ns, current_user_ns());
proc_apply_options(s, fc, pid_ns, current_user_ns());
/* User space would break if executables or devices appear on proc */
s->s_iflags |= SB_I_USERNS_VISIBLE | SB_I_NOEXEC | SB_I_NODEV;
@ -143,7 +144,7 @@ static int proc_reconfigure(struct fs_context *fc)
sync_filesystem(sb);
proc_apply_options(fc, pid, current_user_ns());
proc_apply_options(sb, fc, pid, current_user_ns());
return 0;
}
@ -151,7 +152,6 @@ static int proc_get_tree(struct fs_context *fc)
{
struct proc_fs_context *ctx = fc->fs_private;
proc_apply_options(fc, ctx->pid_ns, current_user_ns());
return get_tree_keyed(fc, proc_fill_super, ctx->pid_ns);
}