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

Commit 2f2cd76d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Explicitly enable greylist for classloader-namespaces"

parents 6f4d4743 9e253ce6

libnativeloader/include/nativeloader/dlext_namespaces.h

+6 −0
Original line number Diff line number Diff line
@@ -55,6 +55,12 @@ enum { 
   * permitted_path from the caller's namespace.

   */

  ANDROID_NAMESPACE_TYPE_SHARED = 2,



  /* This flag instructs linker to enable grey-list workaround for the namespace.

   * See http://b/26394120 for details.

   */

  ANDROID_NAMESPACE_TYPE_GREYLIST_ENABLED = 0x08000000,



  ANDROID_NAMESPACE_TYPE_SHARED_ISOLATED = ANDROID_NAMESPACE_TYPE_SHARED |

                                           ANDROID_NAMESPACE_TYPE_ISOLATED,

};

libnativeloader/native_loader.cpp

+14 −2
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ class LibraryNamespaces { 
  LibraryNamespaces() : initialized_(false) { }



  bool Create(JNIEnv* env,

              uint32_t target_sdk_version,

              jobject class_loader,

              bool is_shared,

              jstring java_library_path,
@@ -141,6 +142,10 @@ class LibraryNamespaces { 
      namespace_type |= ANDROID_NAMESPACE_TYPE_SHARED;

    }



    if (target_sdk_version < 24) {

      namespace_type |= ANDROID_NAMESPACE_TYPE_GREYLIST_ENABLED;

    }



    NativeLoaderNamespace parent_ns;

    bool found_parent_namespace = FindParentNamespaceByClassLoader(env, class_loader, &parent_ns);
@@ -397,12 +402,12 @@ jstring CreateClassLoaderNamespace(JNIEnv* env, 
                                   jstring library_path,

                                   jstring permitted_path) {

#if defined(__ANDROID__)

  UNUSED(target_sdk_version);

  std::lock_guard<std::mutex> guard(g_namespaces_mutex);



  std::string error_msg;

  NativeLoaderNamespace ns;

  bool success = g_namespaces->Create(env,

                                      target_sdk_version,

                                      class_loader,

                                      is_shared,

                                      library_path,
@@ -439,7 +444,14 @@ void* OpenNativeLibrary(JNIEnv* env, 
  if (!g_namespaces->FindNamespaceByClassLoader(env, class_loader, &ns)) {

    // This is the case where the classloader was not created by ApplicationLoaders

    // In this case we create an isolated not-shared namespace for it.

    if (!g_namespaces->Create(env, class_loader, false, library_path, nullptr, &ns, error_msg)) {

    if (!g_namespaces->Create(env,

                              target_sdk_version,

                              class_loader,

                              false,

                              library_path,

                              nullptr,

                              &ns,

                              error_msg)) {

      return nullptr;

    }

  }