upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-10 12:40:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '787-disable-rtld_deepbind-when-compiled-under-asan' into 'master'

Browse source 
Resolve "RTLD_DEEPBIND and AddressSanitizer aren't compatible"

Closes #787

See merge request isc-projects/bind9!1251
This commit is contained in:
Ondřej Surý 2018-12-19 04:46:53 -05:00
commit 35d495db68
4 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/named/unix/dlz_dlopen_driver.c
View file

@ -257,7 +257,7 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[],
/* Open the library */
dlopen_flags = RTLD_NOW|RTLD_GLOBAL;
#ifdef RTLD_DEEPBIND
#if defined(RTLD_DEEPBIND) && !__ADDRESS_SANITIZER__
/*
* If RTLD_DEEPBIND is available then use it. This can avoid
* issues with a module using a different version of a system

2
lib/dns/dyndb.c
View file

@ -133,7 +133,7 @@ load_library(isc_mem_t *mctx, const char *filename, const char *instname,
instname, filename);
flags = RTLD_NOW|RTLD_LOCAL;
#ifdef RTLD_DEEPBIND
#if defined(RTLD_DEEPBIND) && !__ADDRESS_SANITIZER__
flags |= RTLD_DEEPBIND;
#endif

5
lib/isc/include/isc/util.h
View file

@ -206,6 +206,11 @@
#define __has_feature(x) 0
#endif
/* GCC defines __ADDRESS_SANITIZER__, so reuse the macro for clang */
#if __has_feature(address_sanitizer)
#define __ADDRESS_SANITIZER__
#endif
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR >= 6)
#define STATIC_ASSERT(cond, msg) _Static_assert(cond, msg)
#elif __has_feature(c_static_assert)

2
lib/ns/hooks.c
View file

@ -109,7 +109,7 @@ load_plugin(isc_mem_t *mctx, const char *modpath, ns_plugin_t **pluginp) {
REQUIRE(pluginp != NULL && *pluginp == NULL);
flags = RTLD_LAZY | RTLD_LOCAL;
#ifdef RTLD_DEEPBIND
#if defined(RTLD_DEEPBIND) && !__ADDRESS_SANITIZER__
flags |= RTLD_DEEPBIND;
#endif