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

Commit 1bf30245 authored by Nick Kralevich's avatar Nick Kralevich Committed by Gerrit Code Review
Browse files

Merge "Extend installd to support SELinux restorecon function."

parents cdbf28b3 e9887e46

cmds/installd/commands.c

+29 −0
Original line number Diff line number Diff line
@@ -1234,3 +1234,32 @@ fail: 
    }

    return -1;

}



int restorecon_data()

{

    char *data_dir = build_string2(android_data_dir.path, PRIMARY_USER_PREFIX);

    char *user_dir = build_string2(android_data_dir.path, SECONDARY_USER_PREFIX);



    unsigned int flags = SELINUX_ANDROID_RESTORECON_RECURSE |

            SELINUX_ANDROID_RESTORECON_DATADATA;



    int ret = 0;



    if (!data_dir || !user_dir) {

        return -1;

    }



    if (selinux_android_restorecon(data_dir, flags) < 0) {

        ALOGE("restorecon failed for %s: %s\n", data_dir, strerror(errno));

        ret |= -1;

    }



    if (selinux_android_restorecon(user_dir, flags) < 0) {

        ALOGE("restorecon failed for %s: %s\n", user_dir, strerror(errno));

        ret |= -1;

    }



    free(data_dir);

    free(user_dir);

    return ret;

}

cmds/installd/installd.c

+7 −0
Original line number Diff line number Diff line
@@ -129,6 +129,12 @@ static int do_idmap(char **arg, char reply[REPLY_MAX]) 
    return idmap(arg[0], arg[1], atoi(arg[2]));

}



static int do_restorecon_data(char **arg __attribute__((unused)),

    char reply[REPLY_MAX] __attribute__((unused)))

{

    return restorecon_data();

}



struct cmdinfo {

    const char *name;

    unsigned numargs;
@@ -153,6 +159,7 @@ struct cmdinfo cmds[] = { 
    { "mkuserdata",           4, do_mk_user_data },

    { "rmuser",               1, do_rm_user },

    { "idmap",                3, do_idmap },

    { "restorecondata",       0, do_restorecon_data },

};



static int readx(int s, void *_buf, int count)

cmds/installd/installd.h

+1 −0
Original line number Diff line number Diff line
@@ -213,3 +213,4 @@ int dexopt(const char *apk_path, uid_t uid, int is_public, const char *pkgName); 
int movefiles();

int linklib(const char* target, const char* source, int userId);

int idmap(const char *target_path, const char *overlay_path, uid_t uid);

int restorecon_data();