This reverts commit 7ae5af469667a2a5e1803a5a65fc16d9d6b3b965. Signed-off-by: Andrew Vagin <ava...@openvz.org> --- fs/proc/root.c | 3 +-- ipc/mqueue.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/fs/proc/root.c b/fs/proc/root.c index 0b7dbdb..88be7c2 100644 --- a/fs/proc/root.c +++ b/fs/proc/root.c @@ -121,8 +121,7 @@ static struct dentry *proc_mount(struct file_system_type *fs_type, options = data; if (!current_user_ns()->may_mount_proc || - (!ns_capable(ns->user_ns, CAP_SYS_ADMIN) && - !ns_capable(ns->user_ns, CAP_VE_SYS_ADMIN))) + !ns_capable(ns->user_ns, CAP_SYS_ADMIN)) return ERR_PTR(-EPERM); } diff --git a/ipc/mqueue.c b/ipc/mqueue.c index c5f1d3e..657814c 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c @@ -335,8 +335,7 @@ static struct dentry *mqueue_mount(struct file_system_type *fs_type, /* Don't allow mounting unless the caller has CAP_SYS_ADMIN * over the ipc namespace. */ - if (!ns_capable(ns->user_ns, CAP_SYS_ADMIN) && - !ns_capable(ns->user_ns, CAP_VE_SYS_ADMIN)) + if (!ns_capable(ns->user_ns, CAP_SYS_ADMIN)) return ERR_PTR(-EPERM); data = ns; -- 1.7.1 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel