Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60479afa authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge changes I943b04dd,I645b6a2d into jb-mr1-dev 

* changes:
  init: fix return value for android uid/gid check
  init.rc: make last_kmsg readable only by user system and group log
parents b2b46dc4 4f97fd91

init/ueventd.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static int get_android_id(const char *id) 
    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

+2 −0
Original line number Diff line number Diff line
@@ -150,6 +150,8 @@ on post-fs 
    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