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

Commit 9cd97788 authored by Sandro Montanari's avatar Sandro Montanari Committed by Automerger Merge Worker
Browse files

Merge "Create /dev/selinux folder if it was not created by first-stage-init"... 

Merge "Create /dev/selinux folder if it was not created by first-stage-init" am: 344f7160 am: f3ce0486

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2203897



Change-Id: Ica3dc3b77809801a2853a675050795bea029cc30
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a894c263 f3ce0486

init/selinux.cpp

+33 −3
Original line number Diff line number Diff line
@@ -525,6 +525,31 @@ const std::vector<std::string> kApexSepolicy{"apex_file_contexts", "apex_propert 
                                             "apex_service_contexts", "apex_seapp_contexts",

                                             "apex_test"};



Result<void> CreateTmpfsDirIfNeeded() {

    mode_t mode = 0744;

    struct stat stat_data;

    if (stat(kTmpfsDir.c_str(), &stat_data) != 0) {

        if (errno != ENOENT) {

            return ErrnoError() << "Could not stat " << kTmpfsDir;

        }

        if (mkdir(kTmpfsDir.c_str(), mode) != 0) {

            return ErrnoError() << "Could not mkdir " << kTmpfsDir;

        }

    } else {

        if (!S_ISDIR(stat_data.st_mode)) {

            return Error() << kTmpfsDir << " exists and is not a directory.";

        }

    }



    // Need to manually call chmod because mkdir will create a folder with

    // permissions mode & ~umask.

    if (chmod(kTmpfsDir.c_str(), mode) != 0) {

        return ErrnoError() << "Could not chmod " << kTmpfsDir;

    }



    return {};

}



Result<void> PutFileInTmpfs(ZipArchiveHandle archive, const std::string& fileName) {

    ZipEntry entry;

    std::string dstPath = kTmpfsDir + fileName;
@@ -538,7 +563,7 @@ Result<void> PutFileInTmpfs(ZipArchiveHandle archive, const std::string& fileNam 
    unique_fd fd(TEMP_FAILURE_RETRY(

            open(dstPath.c_str(), O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, S_IRUSR | S_IWUSR)));

    if (fd == -1) {

        return Error() << "Failed to open " << dstPath;

        return ErrnoError() << "Failed to open " << dstPath;

    }



    ret = ExtractEntryToFile(archive, &entry, fd);
@@ -568,6 +593,11 @@ Result<void> GetPolicyFromApex(const std::string& dir) { 


    auto handle_guard = android::base::make_scope_guard([&handle] { CloseArchive(handle); });



    auto create = CreateTmpfsDirIfNeeded();

    if (!create.ok()) {

        return create.error();

    }



    for (const auto& file : kApexSepolicy) {

        auto extract = PutFileInTmpfs(handle, file);

        if (!extract.ok()) {