commit 3df086824c79cdc52e1e68269c1c7b21ced3d82c
author Colin Cross <ccross@google.com> Fri Aug 03 14:02:43 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 03 14:02:43 2012 -0700
tree 7f1f9ad0a92c7cf2c9f2fa2f9a2a797fc8861786
parent 00443711cc337574f32aa36e01cfc44c2bc6861a
parent 91368bb1c352dd00b8751b92cb1d6971e0143505

am 91368bb1: am 60479afa: Merge changes I943b04dd,I645b6a2d into jb-mr1-dev

* commit '91368bb1c352dd00b8751b92cb1d6971e0143505':
  init: fix return value for android uid/gid check
  init.rc: make last_kmsg readable only by user system and group log

init/ueventd.c

diff --git a/init/ueventd.c b/init/ueventd.c
index a89e067..a41c31e 100644
--- a/init/ueventd.c
+++ b/init/ueventd.c
@@ -105,7 +105,7 @@
     for (i = 0; i < ARRAY_SIZE(android_ids); i++)
         if (!strcmp(id, android_ids[i].name))
             return android_ids[i].aid;
-    return 0;
+    return -1;
 }
 
 void set_device_permission(int nargs, char **args)

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 22e5e0a..c7063b5 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -150,6 +150,8 @@
     chmod 0440 /proc/kmsg
     chown root system /proc/sysrq-trigger
     chmod 0220 /proc/sysrq-trigger
+    chown system log /proc/last_kmsg
+    chmod 0440 /proc/last_kmsg
 
     # create the lost+found directories, so as to enforce our permissions
     mkdir /cache/lost+found 0770 root root