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

Commit b6bc0a5b authored by Joel Galenson's avatar Joel Galenson Committed by android-build-merger
Browse files

Merge "Run restorecon after init creates a symlink or writes to a file." am:... 

Merge "Run restorecon after init creates a symlink or writes to a file." am: c02b92a9 am: 80d2fdca
am: e24510c7

Change-Id: Ia8f7a556dcc83724e897511647df978d3d61255d
parents 4e391dc2 e24510c7

init/builtins.cpp

+20 −1
Original line number Original line Diff line number Diff line
@@ -65,6 +65,7 @@ 
#include "property_service.h"

#include "property_service.h"

#include "reboot.h"

#include "reboot.h"

#include "rlimit_parser.h"

#include "rlimit_parser.h"

#include "selinux.h"

#include "service.h"

#include "service.h"

#include "subcontext.h"

#include "subcontext.h"

#include "util.h"

#include "util.h"
@@ -641,8 +642,26 @@ static Result<Success> do_trigger(const BuiltinArguments& args) { 
    return Success();

    return Success();

}

}





static int MakeSymlink(const std::string& target, const std::string& linkpath) {

    std::string secontext;

    // Passing 0 for mode should work.

    if (SelabelLookupFileContext(linkpath, 0, &secontext) && !secontext.empty()) {

        setfscreatecon(secontext.c_str());

    }



    int rc = symlink(target.c_str(), linkpath.c_str());



    if (!secontext.empty()) {

        int save_errno = errno;

        setfscreatecon(nullptr);

        errno = save_errno;

    }



    return rc;

}



static Result<Success> do_symlink(const BuiltinArguments& args) {

static Result<Success> do_symlink(const BuiltinArguments& args) {

    if (symlink(args[1].c_str(), args[2].c_str()) < 0) {

    if (MakeSymlink(args[1], args[2]) < 0) {

        // The symlink builtin is often used to create symlinks for older devices to be backwards

        // The symlink builtin is often used to create symlinks for older devices to be backwards

        // compatible with new paths, therefore we skip reporting this error.

        // compatible with new paths, therefore we skip reporting this error.

        if (errno == EEXIST && android::base::GetMinimumLogSeverity() > android::base::DEBUG) {

        if (errno == EEXIST && android::base::GetMinimumLogSeverity() > android::base::DEBUG) {

init/util.cpp

+18 −1
Original line number Original line Diff line number Diff line
@@ -178,9 +178,26 @@ Result<std::string> ReadFile(const std::string& path) { 
    return content;

    return content;

}

}





static int OpenFile(const std::string& path, int flags, mode_t mode) {

    std::string secontext;

    if (SelabelLookupFileContext(path, mode, &secontext) && !secontext.empty()) {

        setfscreatecon(secontext.c_str());

    }



    int rc = open(path.c_str(), flags, mode);



    if (!secontext.empty()) {

        int save_errno = errno;

        setfscreatecon(nullptr);

        errno = save_errno;

    }



    return rc;

}



Result<Success> WriteFile(const std::string& path, const std::string& content) {

Result<Success> WriteFile(const std::string& path, const std::string& content) {

    android::base::unique_fd fd(TEMP_FAILURE_RETRY(

    android::base::unique_fd fd(TEMP_FAILURE_RETRY(

        open(path.c_str(), O_WRONLY | O_CREAT | O_NOFOLLOW | O_TRUNC | O_CLOEXEC, 0600)));

        OpenFile(path, O_WRONLY | O_CREAT | O_NOFOLLOW | O_TRUNC | O_CLOEXEC, 0600)));

    if (fd == -1) {

    if (fd == -1) {

        return ErrnoError() << "open() failed";

        return ErrnoError() << "open() failed";

    }

    }