commit 5b9202d62bea4c74b2c94d070f302ecb0c475bdd
author Dmitry Shmidt <dimitrysh@google.com> Tue Apr 25 12:41:58 2017 -0700
committer Dmitry Shmidt <dimitrysh@google.com> Tue Apr 25 12:42:05 2017 -0700
tree d6f845886c16679746980a91cf05d6a76cb66423
parent a2659b2b785a4e01ad5fbd7c891c0c0fbc3a0d27

Revert "ANDROID: [RFC]cgroup: Change from CAP_SYS_NICE to CAP_SYS_RESOURCE for cgroup migration permissions"

This reverts commit 8cc698d951997aaed1888bfd1167c8d0e2849970.

Change-Id: Iad523b2f7fa83c461a5e965272319fd8f65ef10b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

kernel/cgroup.c

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index e646558..567244c 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -2857,7 +2857,7 @@
 	if (!uid_eq(cred->euid, GLOBAL_ROOT_UID) &&
 	    !uid_eq(cred->euid, tcred->uid) &&
 	    !uid_eq(cred->euid, tcred->suid) &&
-	    !ns_capable(tcred->user_ns, CAP_SYS_RESOURCE))
+	    !ns_capable(tcred->user_ns, CAP_SYS_NICE))
 		ret = -EACCES;
 
 	if (!ret && cgroup_on_dfl(dst_cgrp)) {