diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-07-19 12:37:40 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-07-19 12:37:40 +1000 |
| commit | 476015437f1e3a25fef73b899dd5fed05b2cc3fe (patch) | |
| tree | 5f7ef40a62b71d4241cc8d7db33443d9a55f4be9 | |
| parent | 24a0540708cdf27aa545d38f9371fcebfb9047f5 (diff) | |
| parent | 78008c404acd8e731d1e06618cc5995961e847a6 (diff) | |
Merge remote-tracking branch 'userns/for-next'
| -rw-r--r-- | fs/proc/root.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/proc/root.c b/fs/proc/root.c index 229e366598da..38bd5d423fcd 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c @@ -110,7 +110,8 @@ static struct dentry *proc_mount(struct file_system_type *fs_type, ns = task_active_pid_ns(current); options = data; - if (!current_user_ns()->may_mount_proc) + if (!current_user_ns()->may_mount_proc || + !ns_capable(ns->user_ns, CAP_SYS_ADMIN)) return ERR_PTR(-EPERM); } |