commit 8baf87c79a97d2308ba87a3b6a170fa8a0be4a35
author Ryan Prichard <rprichard@google.com> Tue Apr 21 23:18:39 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 21 23:18:39 2020 +0000
tree 8e3d6445804a5f8fd9529064439235ca1d242c96
parent c9f574f689c8fb4bbddb2bf87b0ca793d8445e0d
parent 19377a55c5fedd917019ac38382c0e921b8ce09d

Merge changes I59024a0a,Iafd12e5a am: 19377a55c5

Change-Id: I11e0c744eade40f2c270e9241863e94ec22f84a0

linker/dlfcn.cpp

diff --git a/linker/dlfcn.cpp b/linker/dlfcn.cpp
index 228e30a..ec6850a 100644
--- a/linker/dlfcn.cpp
+++ b/linker/dlfcn.cpp
@@ -279,10 +279,12 @@
 }
 
 android_namespace_t* __loader_android_get_exported_namespace(const char* name) {
+  ScopedPthreadMutexLocker locker(&g_dl_mutex);
   return get_exported_namespace(name);
 }
 
 void __loader_cfi_fail(uint64_t CallSiteTypeId, void* Ptr, void *DiagData, void *CallerPc) {
+  ScopedPthreadMutexLocker locker(&g_dl_mutex);
   CFIShadowWriter::CfiFail(CallSiteTypeId, Ptr, DiagData, CallerPc);
 }