commit ce0eff9912fa5410fdd90896ff531686077ee54a
author Ryan Prichard <rprichard@google.com> Tue Apr 21 23:32:50 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 21 23:32:50 2020 +0000
tree ef8dae7f08623a01a9cd07e0e3ab8d37cf3b8e7e
parent 84f6be6fa7d0e4a9bad418e8f5edfbd8e9fbad42
parent 8baf87c79a97d2308ba87a3b6a170fa8a0be4a35

Merge changes I59024a0a,Iafd12e5a am: 19377a55c5 am: 8baf87c79a

Change-Id: I8281c59b64bcc3ff7a6697344c7980ce14996343

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);
 }