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

Commit a613819a authored by Nick Kralevich's avatar Nick Kralevich
Browse files

restorecon_recursive("/sys") speed boot time 

Currently, the restorecon_recursive("/sys") call in
init.c takes approx 2 seconds on hammerhead. This change
reduces the delay to 1.2 seconds.

1) Avoid double stat call when using nftw (time savings
of 0.3 seconds)
2) Avoid the repeated calls to is_selinux_enabled() (time
savings of 0.5 seconds)

Avoid calling lsetfilecon if the file is already properly
labeled. This doesn't speed up the restorecon on /sys,
but it should help when handling files on /data.

Bug: 11640230
Change-Id: Ie212ce4f4acade208c5676d60c1f03f50e2388a4
parent 8387fc93

init/util.c

+34 −11
Original line number Original line Diff line number Diff line
@@ -524,31 +524,50 @@ int make_dir(const char *path, mode_t mode) 
    return rc;

    return rc;

}

}





int restorecon(const char *pathname)

static int restorecon_sb(const char *pathname, const struct stat *sb)

{

{

    char *secontext = NULL;

    char *secontext = NULL;

    struct stat sb;

    char *oldsecontext = NULL;

    int i;

    int i;





    if (is_selinux_enabled() <= 0 || !sehandle)

    if (selabel_lookup(sehandle, &secontext, pathname, sb->st_mode) < 0)

        return 0;



    if (lstat(pathname, &sb) < 0)

        return -errno;

        return -errno;

    if (selabel_lookup(sehandle, &secontext, pathname, sb.st_mode) < 0)



    if (lgetfilecon(pathname, &oldsecontext) < 0) {

        freecon(secontext);

        return -errno;

        return -errno;

    }



    if (strcmp(oldsecontext, secontext) != 0) {

        if (lsetfilecon(pathname, secontext) < 0) {

        if (lsetfilecon(pathname, secontext) < 0) {

            freecon(oldsecontext);

            freecon(secontext);

            freecon(secontext);

            return -errno;

            return -errno;

        }

        }

    }

    freecon(oldsecontext);

    freecon(secontext);

    freecon(secontext);

    return 0;

    return 0;

}

}





int restorecon(const char *pathname)

{

    struct stat sb;



    if (is_selinux_enabled() <= 0 || !sehandle)

        return 0;



    if (lstat(pathname, &sb) < 0)

        return -errno;



    return restorecon_sb(pathname, &sb);

}



static int nftw_restorecon(const char* filename, const struct stat* statptr,

static int nftw_restorecon(const char* filename, const struct stat* statptr,

    int fileflags, struct FTW* pftw)

    int fileflags __attribute__((unused)),

    struct FTW* pftw __attribute__((unused)))

{

{

    restorecon(filename);

    restorecon_sb(filename, statptr);

    return 0;

    return 0;

}

}
@@ -556,5 +575,9 @@ int restorecon_recursive(const char* pathname) 
{

{

    int fd_limit = 20;

    int fd_limit = 20;

    int flags = FTW_DEPTH | FTW_MOUNT | FTW_PHYS;

    int flags = FTW_DEPTH | FTW_MOUNT | FTW_PHYS;



    if (is_selinux_enabled() <= 0 || !sehandle)

        return 0;



    return nftw(pathname, nftw_restorecon, fd_limit, flags);

    return nftw(pathname, nftw_restorecon, fd_limit, flags);

}
 
}