diff options
author | Mark Brown <broonie@linaro.org> | 2013-09-27 10:44:04 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-27 10:44:04 +0100 |
commit | 67a681c0333be267b80a509151a4553760069bb2 (patch) | |
tree | cbc73b3ab21d0ab843d9bd659fe185f9986be5bb /fs/proc | |
parent | dafe3258c5449e2697097285c37c761915053eae (diff) | |
parent | 2a0458773656240cf6fa97f1126c92dcddf8ab90 (diff) |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'fs/proc')
-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 41a6ea93f486..04ec276c7bab 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); } |