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

Commit c37cc0ea authored by Nick Kralevich's avatar Nick Kralevich Committed by android-build-merger
Browse files

Merge "init: Put init in group AID_READPROC" am: 99556091 am: ba2a810d am: 041a72ab 

am: 96b19beb

Change-Id: I5388bd8dad4986980cc0abb2be0caab49a96b08c
parents 527c74e2 96b19beb

init/init.cpp

+2 −0
Original line number Diff line number Diff line
@@ -687,6 +687,8 @@ int main(int argc, char** argv) { 
        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

+2 −4
Original line number Diff line number Diff line
@@ -233,11 +233,9 @@ void Service::SetProcessAttributes() { 
            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 (uid_) {

        if (setuid(uid_) != 0) {

            PLOG(FATAL) << "setuid failed for " << name_;