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

Commit 944fc5e6 authored by Nick Kralevich's avatar Nick Kralevich Committed by Android Git Automerger
Browse files

am 915d661c: am 68802416: unconditionally apply SELinux labels to symlinks

* commit '915d661c':
  unconditionally apply SELinux labels to symlinks
parents 45322f93 915d661c
Loading
Loading
Loading
Loading
+9 −10
Original line number Diff line number Diff line
@@ -770,9 +770,17 @@ static int ApplyParsedPerms(
{
    int bad = 0;

    if (parsed.has_selabel) {
        if (lsetfilecon(filename, parsed.selabel) != 0) {
            uiPrintf(state, "ApplyParsedPerms: lsetfilecon of %s to %s failed: %s\n",
                    filename, parsed.selabel, strerror(errno));
            bad++;
        }
    }

    /* ignore symlinks */
    if (S_ISLNK(statptr->st_mode)) {
        return 0;
        return bad;
    }

    if (parsed.has_uid) {
@@ -815,15 +823,6 @@ static int ApplyParsedPerms(
        }
    }

    if (parsed.has_selabel) {
        // TODO: Don't silently ignore ENOTSUP
        if (lsetfilecon(filename, parsed.selabel) && (errno != ENOTSUP)) {
            uiPrintf(state, "ApplyParsedPerms: lsetfilecon of %s to %s failed: %s\n",
                    filename, parsed.selabel, strerror(errno));
            bad++;
        }
    }

    if (parsed.has_capabilities && S_ISREG(statptr->st_mode)) {
        if (parsed.capabilities == 0) {
            if ((removexattr(filename, XATTR_NAME_CAPS) == -1) && (errno != ENODATA)) {