| commit | 59dc5319df91af6ef885407e492b0826a3aa921a | [log] [tgz] |
|---|---|---|
| author | Dmitry Shmidt <dimitrysh@google.com> | Wed Apr 26 11:04:55 2017 -0700 |
| committer | Dmitry Shmidt <dimitrysh@google.com> | Wed Apr 26 11:04:55 2017 -0700 |
| tree | 080a5dffe1f0e648638ccf6dc0b4e2211a1c7e57 | |
| parent | 6dfe0b4a28ce267cdd465479fb7d6b3a740246e4 [diff] | |
| parent | d8c45a773bac76e34c85c584e5c344d994039536 [diff] |
Merge remote-tracking branch 'common/android-4.1' into android-hikey-linaro-4.1-aosp
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index e909845..0fb7250 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c
@@ -2413,7 +2413,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)) { rcu_read_unlock(); ret = -EACCES; goto out_unlock_cgroup;