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

Commit 3d9e2733 authored by Nick Kralevich's avatar Nick Kralevich
Browse files

Mount selinuxfs when other filesystems are mounted 

Be consistent when mounting filesystems, and mount selinuxfs
at the same time other filesystems are mounted. In particular,
this ensures that a /sys/fs/selinux/null is available at early
boot, avoiding an unnecessary mknod call.

Change-Id: I01e6b3900f48b4cb3f12d8a928e1e95911524252
parent 17741bc8

init/init.cpp

+1 −0
Original line number Diff line number Diff line
@@ -561,6 +561,7 @@ int main(int argc, char** argv) { 
        #define MAKE_STR(x) __STRING(x)

        mount("proc", "/proc", "proc", 0, "hidepid=2,gid=" MAKE_STR(AID_READPROC));

        mount("sysfs", "/sys", "sysfs", 0, NULL);

        mount("selinuxfs", "/sys/fs/selinux", "selinuxfs", 0, NULL);

    }



    // We must have some place other than / to create the device nodes for

init/util.cpp

+10 −12
Original line number Diff line number Diff line
@@ -401,21 +401,19 @@ int wait_for_file(const char *filename, int timeout) 


void open_devnull_stdio(void)

{

    // Try to avoid the mknod() call if we can. Since SELinux makes

    // a /dev/null replacement available for free, let's use it.

    int fd = open("/sys/fs/selinux/null", O_RDWR);

    if (fd == -1) {

        // OOPS, /sys/fs/selinux/null isn't available, likely because

        // /sys/fs/selinux isn't mounted. Fall back to mknod.

        static const char *name = "/dev/__null__";

        if (mknod(name, S_IFCHR | 0600, (1 << 8) | 3) == 0) {

            fd = open(name, O_RDWR);

            unlink(name);

        }

        if (fd == -1) {

        /* Fail silently.

         * stdout/stderr isn't available, and because

         * klog_init() is called after open_devnull_stdio(), we can't

         * log to dmesg. Reordering klog_init() to be called before

         * open_devnull_stdio() isn't an option either, as then klog_fd

         * will be assigned 0 or 1, which will end up getting clobbered

         * by the code below. There's nowhere good to log.

         */



        exit(1);

    }

    }



    dup2(fd, 0);

    dup2(fd, 1);