Merge "Allow read access to /proc entries for other UIDs" am: fd53598220 am: 877b5daecc
am: 3e606062b3
* commit '3e606062b3b2e8143f5353a7028e78b25a803aa8':
Allow read access to /proc entries for other UIDs
diff --git a/cmds/dumpstate/dumpstate.c b/cmds/dumpstate/dumpstate.c
index e460059..de51419 100644
--- a/cmds/dumpstate/dumpstate.c
+++ b/cmds/dumpstate/dumpstate.c
@@ -693,7 +693,7 @@
/* switch to non-root user and group */
gid_t groups[] = { AID_LOG, AID_SDCARD_R, AID_SDCARD_RW,
- AID_MOUNT, AID_INET, AID_NET_BW_STATS };
+ AID_MOUNT, AID_INET, AID_NET_BW_STATS, AID_READPROC };
if (setgroups(sizeof(groups)/sizeof(groups[0]), groups) != 0) {
ALOGE("Unable to setgroups, aborting: %s\n", strerror(errno));
return -1;
diff --git a/cmds/servicemanager/servicemanager.rc b/cmds/servicemanager/servicemanager.rc
index 7154fab..a6a4d03 100644
--- a/cmds/servicemanager/servicemanager.rc
+++ b/cmds/servicemanager/servicemanager.rc
@@ -1,7 +1,7 @@
service servicemanager /system/bin/servicemanager
class core
user system
- group system
+ group system readproc
critical
onrestart restart healthd
onrestart restart zygote
diff --git a/services/surfaceflinger/surfaceflinger.rc b/services/surfaceflinger/surfaceflinger.rc
index 59a43e2..eb9bd25 100644
--- a/services/surfaceflinger/surfaceflinger.rc
+++ b/services/surfaceflinger/surfaceflinger.rc
@@ -1,6 +1,6 @@
service surfaceflinger /system/bin/surfaceflinger
class core
user system
- group graphics drmrpc
+ group graphics drmrpc readproc
onrestart restart zygote
writepid /dev/cpuset/system-background/tasks