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

Commit 38344408 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Not all filesystems support setting SELinux labels. 

Bug: http://b/23530370
Change-Id: Ie4deb3544304754696f049d17b12168cad4a51fd
parent c3d61786

adb/file_sync_service.cpp

+3 −4
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ static bool secure_mkdirs(const std::string& path) { 
            if (chown(partial_path.c_str(), uid, gid) == -1) {

                return false;

            }

            // Not all filesystems support setting SELinux labels. http://b/23530370.

            selinux_android_restorecon(partial_path.c_str(), 0);

        }

    }
@@ -166,10 +167,8 @@ static bool handle_send_file(int s, const char* path, uid_t uid, 
            goto fail;

        }



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

            SendSyncFailErrno(s, "selinux_android_restorecon failed");

            goto fail;

        }

        // Not all filesystems support setting SELinux labels. http://b/23530370.

        selinux_android_restorecon(path, 0);



        // fchown clears the setuid bit - restore it if present.

        // Ignore the result of calling fchmod. It's not supported