diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-10-27 10:17:22 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-10-27 10:17:22 -0700 |
| commit | a979feb9e9f1827463f61ad241b198aa7dc27cd3 (patch) | |
| tree | 36146e3194d22968409b8c903b50782ca2888af4 /kernel/cgroup.c | |
| parent | f8c1167680a1e0755500a0724bde9898a3e18061 (diff) | |
| parent | b6be9b7b199b05a13d72dc562110eebc725ed0ec (diff) | |
Merge remote-tracking branch 'common/android-4.4' into android-4.4.y
Diffstat (limited to 'kernel/cgroup.c')
| -rw-r--r-- | kernel/cgroup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index fcb037068e3f..e4552a3cbf41 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -2686,7 +2686,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_SYS_NICE)) + !ns_capable(tcred->user_ns, CAP_SYS_RESOURCE)) ret = -EACCES; if (!ret && cgroup_on_dfl(dst_cgrp)) { |