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

Commit a5c03714 authored by Dimitry Ivanov's avatar Dimitry Ivanov Committed by android-build-merger
Browse files

Merge "Extend white-listed directories to include /mnt/expand" 

am: 3fb5f138

* commit '3fb5f138':
  Extend white-listed directories to include /mnt/expand

Change-Id: I106dac170a9acb80835082916e6aa09328e5fb11
parents 23e13127 3fb5f138

libnativeloader/native_loader.cpp

+14 −2
Original line number Original line Diff line number Diff line
@@ -39,6 +39,11 @@ namespace android { 
static constexpr const char* kPublicNativeLibrariesSystemConfigPathFromRoot = "/etc/public.libraries.txt";

static constexpr const char* kPublicNativeLibrariesSystemConfigPathFromRoot = "/etc/public.libraries.txt";

static constexpr const char* kPublicNativeLibrariesVendorConfig = "/vendor/etc/public.libraries.txt";

static constexpr const char* kPublicNativeLibrariesVendorConfig = "/vendor/etc/public.libraries.txt";





// (http://b/27588281) This is a workaround for apps using custom classloaders and calling

// System.load() with an absolute path which is outside of the classloader library search path.

// This list includes all directories app is allowed to access this way.

static constexpr const char* kWhitelistedDirectories = "/data:/mnt/expand";



static bool is_debuggable() {

static bool is_debuggable() {

  char debuggable[PROP_VALUE_MAX];

  char debuggable[PROP_VALUE_MAX];

  property_get("ro.debuggable", debuggable, "0");

  property_get("ro.debuggable", debuggable, "0");
@@ -61,10 +66,17 @@ class LibraryNamespaces { 
      library_path = library_path_utf_chars.c_str();

      library_path = library_path_utf_chars.c_str();

    }

    }





    std::string permitted_path;

    // (http://b/27588281) This is a workaround for apps using custom

    // classloaders and calling System.load() with an absolute path which

    // is outside of the classloader library search path.

    //

    // This part effectively allows such a classloader to access anything

    // under /data and /mnt/expand

    std::string permitted_path = kWhitelistedDirectories;



    if (java_permitted_path != nullptr) {

    if (java_permitted_path != nullptr) {

      ScopedUtfChars path(env, java_permitted_path);

      ScopedUtfChars path(env, java_permitted_path);

      permitted_path = path.c_str();

      permitted_path = permitted_path + ":" + path.c_str();

    }

    }





    if (!initialized_ && !InitPublicNamespace(library_path.c_str())) {

    if (!initialized_ && !InitPublicNamespace(library_path.c_str())) {