diff options
| author | Todd Kjos <tkjos@google.com> | 2017-04-25 18:30:45 +0000 |
|---|---|---|
| committer | Todd Kjos <tkjos@google.com> | 2017-04-25 18:31:07 +0000 |
| commit | d77312aeb21d93c3547f20b8cc09916daa928acc (patch) | |
| tree | 2c88331bc552d29269b91847a7301a884dd68cf9 /kernel | |
| parent | b834e929774513db929303125486c2c34bedba73 (diff) | |
Revert "[RFC]cgroup: Change from CAP_SYS_NICE to CAP_SYS_RESOURCE for cgroup migration permissions"
This reverts commit 64f0245f312a849acc83b7c6cdcc8f7c1a14cca3.
Needs to be reverted since system_server no longer has CAP_SYS_RESOURCE.
Change-Id: Ic500cffb14b80a3e2a5dd41fda0b0b781b5245d6
Diffstat (limited to 'kernel')
| -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 253fdeabf667..8ab133d96435 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -2689,7 +2689,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_RESOURCE)) + !ns_capable(tcred->user_ns, CAP_SYS_NICE)) ret = -EACCES; if (!ret && cgroup_on_dfl(dst_cgrp)) { |