diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2019-05-12 18:10:24 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2019-05-25 18:00:00 -0400 |
| commit | 46cf047a945c7a53cb2dc9353a87a9a4e3e778cd (patch) | |
| tree | f7dcda6f043952e36cbd62c9b57ed4d34cf8d5b5 /fs | |
| parent | 709a643da8b8c5fc823e1870d8227ca0eeb51311 (diff) | |
| download | linux-46cf047a945c7a53cb2dc9353a87a9a4e3e778cd.tar.gz linux-46cf047a945c7a53cb2dc9353a87a9a4e3e778cd.tar.bz2 linux-46cf047a945c7a53cb2dc9353a87a9a4e3e778cd.zip | |
procfs: set ->user_ns before calling ->get_tree()
here it's even simpler than in mqueue - pid_ns_prepare_proc()
does everything needed anyway.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/proc/root.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/proc/root.c b/fs/proc/root.c index 8b145e7b9661..74c2c6ab10bd 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c @@ -157,8 +157,6 @@ static int proc_get_tree(struct fs_context *fc) { struct proc_fs_context *ctx = fc->fs_private; - put_user_ns(fc->user_ns); - fc->user_ns = get_user_ns(ctx->pid_ns->user_ns); fc->s_fs_info = ctx->pid_ns; return vfs_get_super(fc, vfs_get_keyed_super, proc_fill_super); } @@ -167,8 +165,7 @@ static void proc_fs_context_free(struct fs_context *fc) { struct proc_fs_context *ctx = fc->fs_private; - if (ctx->pid_ns) - put_pid_ns(ctx->pid_ns); + put_pid_ns(ctx->pid_ns); kfree(ctx); } @@ -188,6 +185,8 @@ static int proc_init_fs_context(struct fs_context *fc) return -ENOMEM; ctx->pid_ns = get_pid_ns(task_active_pid_ns(current)); + put_user_ns(fc->user_ns); + fc->user_ns = get_user_ns(ctx->pid_ns->user_ns); fc->fs_private = ctx; fc->ops = &proc_fs_context_ops; return 0; |