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

Commit 27a93650 authored by Stephen Smalley's avatar Stephen Smalley
Browse files

Convert all selinux_android_restorecon and _setfilecon calls to new API. 



libselinux selinux_android_restorecon API is changing to the more
general interface with flags and dropping the older variants.

Also get rid of the old, no longer used selinux_android_setfilecon API
and rename selinux_android_setfilecon2 to it as it is the only API in use.

Change-Id: I1e71ec398ccdc24cac4ec76f1b858d0f680f4925
Signed-off-by: default avatarStephen Smalley <sds@tycho.nsa.gov>
parent 71de56a0

adb/file_sync_service.c

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static int mkdirs(char *name) 
                *x = '/';

                return ret;

            }

            selinux_android_restorecon(name);

            selinux_android_restorecon(name, 0);

        }

        *x++ = '/';

    }
@@ -246,7 +246,7 @@ static int handle_send_file(int s, char *path, uid_t uid, 
    if(fd >= 0) {

        struct utimbuf u;

        adb_close(fd);

        selinux_android_restorecon(path);

        selinux_android_restorecon(path, 0);

        u.actime = timestamp;

        u.modtime = timestamp;

        utime(path, &u);

debuggerd/tombstone.cpp

+1 −1
Original line number Diff line number Diff line
@@ -741,7 +741,7 @@ char* engrave_tombstone( 
      LOG("failed to change ownership of %s: %s\n", TOMBSTONE_DIR, strerror(errno));

  }



  if (selinux_android_restorecon(TOMBSTONE_DIR) == -1) {

  if (selinux_android_restorecon(TOMBSTONE_DIR, 0) == -1) {

    *detach_failed = false;

    return NULL;

  }

init/util.c

+2 −2
Original line number Diff line number Diff line
@@ -527,10 +527,10 @@ int make_dir(const char *path, mode_t mode) 


int restorecon(const char* pathname)

{

    return selinux_android_restorecon(pathname);

    return selinux_android_restorecon(pathname, 0);

}



int restorecon_recursive(const char* pathname)

{

    return selinux_android_restorecon_recursive(pathname);

    return selinux_android_restorecon(pathname, SELINUX_ANDROID_RESTORECON_RECURSE);

}

toolbox/restorecon.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ int restorecon_main(int argc, char **argv) 
        usage();



    for (i = 0; i < argc; i++) {

        rc = selinux_android_restorecon_flags(argv[i], flags);

        rc = selinux_android_restorecon(argv[i], flags);

        if (rc < 0)

            fprintf(stderr, "Could not restorecon %s:  %s\n", argv[i],

                    strerror(errno));