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

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

Merge "Ensure that app lib symlinks are correctly labeled when created."

parents bd20e551 3a983892

cmds/installd/commands.c

+14 −14
Original line number Diff line number Diff line
@@ -85,13 +85,6 @@ int install(const char *pkgname, uid_t uid, gid_t gid, const char *seinfo) 
        }

    }



    if (symlink(applibdir, libsymlink) < 0) {

        ALOGE("couldn't symlink directory '%s' -> '%s': %s\n", libsymlink, applibdir,

                strerror(errno));

        unlink(pkgdir);

        return -1;

    }



    if (selinux_android_setfilecon(pkgdir, pkgname, seinfo, uid) < 0) {

        ALOGE("cannot setfilecon dir '%s': %s\n", pkgdir, strerror(errno));

        unlink(libsymlink);
@@ -99,6 +92,13 @@ int install(const char *pkgname, uid_t uid, gid_t gid, const char *seinfo) 
        return -errno;

    }



    if (symlink(applibdir, libsymlink) < 0) {

        ALOGE("couldn't symlink directory '%s' -> '%s': %s\n", libsymlink, applibdir,

                strerror(errno));

        unlink(pkgdir);

        return -1;

    }



    if (chown(pkgdir, uid, gid) < 0) {

        ALOGE("cannot chown dir '%s': %s\n", pkgdir, strerror(errno));

        unlink(libsymlink);
@@ -241,13 +241,6 @@ int make_user_data(const char *pkgname, uid_t uid, userid_t userid, const char* 
        }

    }



    if (symlink(applibdir, libsymlink) < 0) {

        ALOGE("couldn't symlink directory for non-primary '%s' -> '%s': %s\n", libsymlink,

                applibdir, strerror(errno));

        unlink(pkgdir);

        return -1;

    }



    if (selinux_android_setfilecon(pkgdir, pkgname, seinfo, uid) < 0) {

        ALOGE("cannot setfilecon dir '%s': %s\n", pkgdir, strerror(errno));

        unlink(libsymlink);
@@ -255,6 +248,13 @@ int make_user_data(const char *pkgname, uid_t uid, userid_t userid, const char* 
        return -errno;

    }



    if (symlink(applibdir, libsymlink) < 0) {

        ALOGE("couldn't symlink directory for non-primary '%s' -> '%s': %s\n", libsymlink,

                applibdir, strerror(errno));

        unlink(pkgdir);

        return -1;

    }



    if (chown(pkgdir, uid, uid) < 0) {

        ALOGE("cannot chown dir '%s': %s\n", pkgdir, strerror(errno));

        unlink(libsymlink);