aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2016-12-13 17:28:55 -0800
committerJohn Stultz <john.stultz@linaro.org>2017-01-23 17:15:17 -0800
commit1b91d4c81b9e50116276363a40617cfc0faeec96 (patch)
treef6c9352e40c99d963392cafdc81ba6a1aeb526ba
parent8fc181d664be55e81137c894a16a7ad876c43c00 (diff)
HACK: Use CAP_SYS_RESOURCE instead of CAP_CGROUP for nowdev/hikey-mainline-WIP
Andorid userspace needs changes to be able to use CAP_CGROUP so for now, just use CAP_SYS_RESOURCE. NOT FOR UPSTREAM! Signed-off-by: John Stultz <john.stultz@linaro.org>
-rw-r--r--kernel/cgroup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 8b42ae35138b..666455f726c6 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -2857,7 +2857,7 @@ static int cgroup_procs_write_permission(struct task_struct *task,
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_CGROUP))
+ !ns_capable(tcred->user_ns, CAP_SYS_RESOURCE))
ret = -EACCES;
if (!ret && cgroup_on_dfl(dst_cgrp)) {