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

Commit c52f6e31 authored by Thiébaud Weksteen's avatar Thiébaud Weksteen Committed by Automerger Merge Worker
Browse files

Merge "Replace security_context_t type" am: 8bf8b19e am: 2130d975 am:... 

Merge "Replace security_context_t type" am: 8bf8b19e am: 2130d975 am: 14164268 am: 49ee150b am: 3b4b1466

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1827241

Change-Id: Iaae68dd8c7a6ed7684146520bd4c6c369e8870a9
parents 8a0e3684 3b4b1466

core/jni/com_android_internal_os_Zygote.cpp

+3 −3
Original line number Diff line number Diff line
@@ -1142,14 +1142,14 @@ static void isolateAppDataPerPackage(int userId, std::string_view package_name, 
}



// Relabel directory

static void relabelDir(const char* path, security_context_t context, fail_fn_t fail_fn) {

static void relabelDir(const char* path, const char* context, fail_fn_t fail_fn) {

  if (setfilecon(path, context) != 0) {

    fail_fn(CREATE_ERROR("Failed to setfilecon %s %s", path, strerror(errno)));

  }

}



// Relabel all directories under a path non-recursively.

static void relabelAllDirs(const char* path, security_context_t context, fail_fn_t fail_fn) {

static void relabelAllDirs(const char* path, const char* context, fail_fn_t fail_fn) {

  DIR* dir = opendir(path);

  if (dir == nullptr) {

    fail_fn(CREATE_ERROR("Failed to opendir %s", path));
@@ -1224,7 +1224,7 @@ static void isolateAppData(JNIEnv* env, const std::vector<std::string>& merged_d 
  snprintf(internalDePath, PATH_MAX, "/data/user_de");

  snprintf(externalPrivateMountPath, PATH_MAX, "/mnt/expand");



  security_context_t dataDataContext = nullptr;

  char* dataDataContext = nullptr;

  if (getfilecon(internalDePath, &dataDataContext) < 0) {

    fail_fn(CREATE_ERROR("Unable to getfilecon on %s %s", internalDePath,

        strerror(errno)));