From a039d0b61ae2e34baf7ea57d572c23125094b965 Mon Sep 17 00:00:00 2001 From: David Snopek Date: Mon, 30 Oct 2023 16:14:59 -0500 Subject: [PATCH] Linux: Disable RTLD_DEEPBIND mode for dlopen() in sanitizer builds --- drivers/unix/os_unix.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index 581daaca059..9a77930d75b 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -85,6 +85,12 @@ #define RTLD_DEEPBIND 0 #endif +#ifndef SANITIZERS_ENABLED +#define GODOT_DLOPEN_MODE RTLD_NOW | RTLD_DEEPBIND +#else +#define GODOT_DLOPEN_MODE RTLD_NOW +#endif + #if defined(MACOS_ENABLED) || (defined(__ANDROID_API__) && __ANDROID_API__ >= 28) // Random location for getentropy. Fitting. #include @@ -650,7 +656,7 @@ Error OS_Unix::open_dynamic_library(const String p_path, void *&p_library_handle path = get_executable_path().get_base_dir().path_join("../lib").path_join(p_path.get_file()); } - p_library_handle = dlopen(path.utf8().get_data(), RTLD_NOW | RTLD_DEEPBIND); + p_library_handle = dlopen(path.utf8().get_data(), GODOT_DLOPEN_MODE); ERR_FAIL_NULL_V_MSG(p_library_handle, ERR_CANT_OPEN, vformat("Can't open dynamic library: %s. Error: %s.", p_path, dlerror())); if (r_resolved_path != nullptr) {