[Devel] [PATCH RHEL7 COMMIT] Remove CAP_VE_* from "ve/ns: Port diff-ve-ns-allow-create-new-pid-ipc-and-utc-namespaces"

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-229.7.2.vz7.8.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-229.7.2.vz7.6.8
------>
commit 50bcddcb00a418f939a35472bec60c3d1022a3e8
Author: Andrew Vagin <avagin at openvz.org>
Date:   Tue Sep 8 12:53:47 2015 +0400

    Remove CAP_VE_* from "ve/ns: Port diff-ve-ns-allow-create-new-pid-ipc-and-utc-namespaces"
    
    https://jira.sw.ru/browse/PSBM-39077
    
    Signed-off-by: Andrew Vagin <avagin at virtuozzo.com>
    Reviewed-by: Vladimir Davydov <vdavydov at virtuozzo.com>
---
 kernel/nsproxy.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index 9e1dda3..62aebc8 100644
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -136,8 +136,7 @@ int copy_namespaces(unsigned long flags, struct task_struct *tsk)
 				CLONE_NEWPID | CLONE_NEWNET)))
 		return 0;
 
-	if (!ns_capable(user_ns, CAP_SYS_ADMIN) &&
-	    !ns_capable(user_ns, CAP_VE_SYS_ADMIN)) {
+	if (!ns_capable(user_ns, CAP_SYS_ADMIN)) {
 		err = -EPERM;
 		goto out;
 	}