commit 687f114b0a7c15d34419ef307d42c77dd62a7520
author Nick Kralevich <nnk@google.com> Mon Oct 31 19:21:49 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 31 19:21:49 2016 +0000
tree b639ff8218f96eb222c7476e47e61b5accf45e14
parent 8354f17dc80109e75aae7fe575769e978ee320f0
parent fd2b99b41f0c9a00e500748118d561c119482de5

Merge "init: Put init in group AID_READPROC"
am: 995560919c

Change-Id: Id2271f8200b020fe5ccaa82e3ea4b68368a6adf1

init/init.cpp

diff --git a/init/init.cpp b/init/init.cpp
index 3c121e8..7c37d28 100644
--- a/init/init.cpp
+++ b/init/init.cpp
@@ -585,6 +585,8 @@
         mount("devpts", "/dev/pts", "devpts", 0, NULL);
         #define MAKE_STR(x) __STRING(x)
         mount("proc", "/proc", "proc", 0, "hidepid=2,gid=" MAKE_STR(AID_READPROC));
+        gid_t groups[] = { AID_READPROC };
+        setgroups(arraysize(groups), groups);
         mount("sysfs", "/sys", "sysfs", 0, NULL);
         mount("selinuxfs", "/sys/fs/selinux", "selinuxfs", 0, NULL);
         mknod("/dev/kmsg", S_IFCHR | 0600, makedev(1, 11));

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index 6460e71..92f1615 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -233,10 +233,8 @@
             PLOG(FATAL) << "setgid failed for " << name_;
         }
     }
-    if (!supp_gids_.empty()) {
-        if (setgroups(supp_gids_.size(), &supp_gids_[0]) != 0) {
-            PLOG(FATAL) << "setgroups failed for " << name_;
-        }
+    if (setgroups(supp_gids_.size(), &supp_gids_[0]) != 0) {
+        PLOG(FATAL) << "setgroups failed for " << name_;
     }
     if (uid_) {
         if (setuid(uid_) != 0) {