Merge changes I59024a0a,Iafd12e5a

* changes:
  __loader_cfi_fail: acquire g_dl_mutex
  android_get_exported_namespace: acquire g_dl_mutex
This commit is contained in:
Ryan Prichard 2020-04-21 23:01:13 +00:00 committed by Gerrit Code Review
commit 19377a55c5

View file

@ -279,10 +279,12 @@ bool __loader_android_link_namespaces_all_libs(android_namespace_t* namespace_fr
} }
android_namespace_t* __loader_android_get_exported_namespace(const char* name) { android_namespace_t* __loader_android_get_exported_namespace(const char* name) {
ScopedPthreadMutexLocker locker(&g_dl_mutex);
return get_exported_namespace(name); return get_exported_namespace(name);
} }
void __loader_cfi_fail(uint64_t CallSiteTypeId, void* Ptr, void *DiagData, void *CallerPc) { void __loader_cfi_fail(uint64_t CallSiteTypeId, void* Ptr, void *DiagData, void *CallerPc) {
ScopedPthreadMutexLocker locker(&g_dl_mutex);
CFIShadowWriter::CfiFail(CallSiteTypeId, Ptr, DiagData, CallerPc); CFIShadowWriter::CfiFail(CallSiteTypeId, Ptr, DiagData, CallerPc);
} }