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

Commit f334cbf0 authored by Dimitry Ivanov's avatar Dimitry Ivanov
Browse files

Extend white-listed directories to include /mnt/expand 

Apps on sdcard live under /mnt/expand and therefore
this directory should be under linker namespaces
permitted_path.

Bug: http://b/28639227
Change-Id: I462f9f23656c95d9c2a48bb3f513abcd9d08f340
parent cf9892b6

libnativeloader/native_loader.cpp

+14 −10
Original line number Diff line number Diff line
@@ -40,6 +40,11 @@ namespace android { 
static constexpr const char* kPublicNativeLibrariesSystemConfigPathFromRoot = "/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() {

  char debuggable[PROP_VALUE_MAX];

  property_get("ro.debuggable", debuggable, "0");
@@ -63,18 +68,17 @@ class LibraryNamespaces { 
      library_path = library_path_utf_chars.c_str();

    }



    std::string permitted_path;

    if (java_permitted_path != nullptr) {

      ScopedUtfChars path(env, java_permitted_path);

      permitted_path = path.c_str();

    } else {

    // (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

      permitted_path = "/data";

    // under /data and /mnt/expand

    std::string permitted_path = kWhitelistedDirectories;



    if (java_permitted_path != nullptr) {

      ScopedUtfChars path(env, java_permitted_path);

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

    }



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