commit 552f23deef9491f4e60b78f1ca6f89b7b60c5de2
author Jeff Vander Stoep <jeffv@google.com> Sat Jul 25 16:38:32 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Jul 25 16:38:32 2015 +0000
tree c5b07090d8574c8ef7704fab6aa1965b9822696c
parent 919bb66f73c679cf81efc6d2433ad75197891ba6
parent 1d0fe13a9e720a88766b38070195670183274e30

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

* commit '1d0fe13a9e720a88766b38070195670183274e30':
  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 7756618..4751e53 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -147,9 +147,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.
@@ -532,6 +532,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