From 1b91d4c81b9e50116276363a40617cfc0faeec96 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Tue, 13 Dec 2016 17:28:55 -0800 Subject: HACK: Use CAP_SYS_RESOURCE instead of CAP_CGROUP for now 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 --- kernel/cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)) { -- cgit v1.2.3