mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2025-12-06 09:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

JBR-2253: unset LD_PRELOAD just after VM loaded

Browse Source 
workaround for JBR-2253 Preload libjsig.so to fix JNA crashes

(cherry picked from commit 127a2deddf)
This commit is contained in:
Artem Bochkarev
2020-04-28 22:20:33 +03:00
committed by jbrbot
parent 52b3618c02
commit 68bd6ac6ba
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/hotspot/share/prims/jni.cpp
View File

@@ -3524,6 +3524,19 @@ _JNI_IMPORT_OR_EXPORT_ jint JNICALL JNI_GetDefaultJavaVMInitArgs(void *args_) {
return ret;
}
#ifdef LINUX
static void unsetLdPreload() {
// Workaround for: JBR-2253 Preload libjsig.so to fix JNA crashes
// NOTE: Probably it still can affect child processes, see
// https://stackoverflow.com/questions/3275015/ld-preload-affects-new-child-even-after-unsetenvld-preload
char * envUnset = ::getenv("UNSET_LD_PRELOAD");
if (envUnset != NULL && strlen(envUnset) > 3 && strncmp("true", envUnset, 4) == 0) {
unsetenv("LD_PRELOAD");
fprintf(stdout, "LD_PRELOAD was unset\n");
}
}
#endif //LINUX
DT_RETURN_MARK_DECL(CreateJavaVM, jint
, HOTSPOT_JNI_CREATEJAVAVM_RETURN(_ret_ref));
@@ -3630,6 +3643,10 @@ static jint JNI_CreateJavaVM_inner(JavaVM **vm, void **penv, void *args) {
// Since this is not a JVM_ENTRY we have to set the thread state manually before leaving.
ThreadStateTransition::transition_from_vm(thread, _thread_in_native);
MACOS_AARCH64_ONLY(thread->enable_wx(WXExec));
#ifdef LINUX
unsetLdPreload();
#endif //LINUX
} else {
// If create_vm exits because of a pending exception, exit with that
// exception. In the future when we figure out how to reclaim memory,