commit 10bf6c6b2eda2e7493100b3fb0f68240f306e64f
author Jeff Vander Stoep <jeffv@google.com> Sat Jul 25 00:59:33 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Jul 25 00:59:33 2015 +0000
tree 849fdb2678ccb8d68db9751f2fcfedf20a52dff6
parent 3965c717172bbd84310cecf598c685207e51346b
parent b5891f1d9aa5e45fca6f77427c2c64ed93b3514e

am 3f62a020: logd: allow logd to write to /dev/cpuset files

* commit '3f62a020c48d5d812fb2898759b93a59dc24d310':
  logd: allow logd to write to /dev/cpuset files

logd/main.cpp

diff --git a/logd/main.cpp b/logd/main.cpp
index 9b88983..a3241d0 100644
--- a/logd/main.cpp
+++ b/logd/main.cpp
@@ -103,6 +103,10 @@
         return -1;
     }
 
+    if (setgroups(0, NULL) == -1) {
+        return -1;
+    }
+
     if (setgid(AID_LOGD) != 0) {
         return -1;
     }

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 0ac6698..45e6dc9 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -152,9 +152,9 @@
     chown system system /dev/cpuset/tasks
     chown system system /dev/cpuset/foreground/tasks
     chown system system /dev/cpuset/background/tasks
-    chmod 0644 /dev/cpuset/foreground/tasks
-    chmod 0644 /dev/cpuset/background/tasks
-    chmod 0644 /dev/cpuset/tasks
+    chmod 0664 /dev/cpuset/foreground/tasks
+    chmod 0664 /dev/cpuset/background/tasks
+    chmod 0664 /dev/cpuset/tasks
 
 
     # qtaguid will limit access to specific data based on group memberships.
@@ -539,6 +539,7 @@
     socket logd stream 0666 logd logd
     socket logdr seqpacket 0666 logd logd
     socket logdw dgram 0222 logd logd
+    group root system
 
 service logd-reinit /system/bin/logd --reinit
     oneshot