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

Commit 40f2f751 authored by Kenny Root's avatar Kenny Root Committed by Gerrit Code Review
Browse files

Merge "Fix mistaken removal of setfilecon"

parents 85f9ba9e 57c63d8f

cmds/installd/commands.c

+8 −1
Original line number Diff line number Diff line
@@ -73,13 +73,20 @@ int install(const char *pkgname, uid_t uid, gid_t gid) 
        return -errno;

    }



    if (selinux_android_setfilecon(libdir, pkgname, uid) < 0) {

    if (selinux_android_setfilecon(libdir, pkgname, AID_SYSTEM) < 0) {

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

        unlink(libdir);

        unlink(pkgdir);

        return -errno;

    }



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

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

        unlink(libdir);

        unlink(pkgdir);

        return -errno;

    }



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

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

        unlink(libdir);