commit 633d76742782dc977d9642c044bca076348c140b
author android-build-team Robot <android-build-team-robot@google.com> Fri Apr 21 20:40:15 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 21 20:40:21 2017 +0000
tree a1bcb3bcb6850c0ea9cc4a29ada23b55acdd55e9
parent 3227183891b4cf79db91461f9e182621b674bf3d
parent 2dec62801bc2291b08dad8f78af78d1362a61d0d

Merge "Fix out of bound read in libziparchive" into snap-temp-L87400000056978794

libcutils/sched_policy.c

diff --git a/libcutils/sched_policy.c b/libcutils/sched_policy.c
index 05a2048..6d90589 100644
--- a/libcutils/sched_policy.c
+++ b/libcutils/sched_policy.c
@@ -404,7 +404,7 @@
         }
 
 
-        if (add_tid_to_cgroup(tid, fd) != 0) {
+        if (fd > 0 && add_tid_to_cgroup(tid, fd) != 0) {
             if (errno != ESRCH && errno != ENOENT)
                 return -errno;
         }

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index df60f65..7dc9e55 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -145,15 +145,6 @@
     write /dev/cpuctl/cpu.rt_period_us 1000000
     write /dev/cpuctl/cpu.rt_runtime_us 950000
 
-    mkdir /dev/cpuctl/bg_non_interactive
-    chown system system /dev/cpuctl/bg_non_interactive/tasks
-    chmod 0666 /dev/cpuctl/bg_non_interactive/tasks
-    # 5.0 %
-    write /dev/cpuctl/bg_non_interactive/cpu.shares 52
-    write /dev/cpuctl/bg_non_interactive/cpu.rt_period_us 1000000
-    # active FIFO threads will never be in BG
-    write /dev/cpuctl/bg_non_interactive/cpu.rt_runtime_us 10000
-
     # sets up initial cpusets for ActivityManager
     mkdir /dev/cpuset
     mount cpuset none /dev/cpuset