summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorguenther <guenther@openbsd.org>2016-03-21 01:52:45 +0000
committerguenther <guenther@openbsd.org>2016-03-21 01:52:45 +0000
commit11ee7b6e42a2a0a0ad83f4f90999ab9fb5282ba4 (patch)
tree386aebaa194570b923b4a745c6f168e96e823b10
parentSwitch ld.so's stack smash handler from sendsyslog to sendsyslog2 (diff)
downloadwireguard-openbsd-11ee7b6e42a2a0a0ad83f4f90999ab9fb5282ba4.tar.xz
wireguard-openbsd-11ee7b6e42a2a0a0ad83f4f90999ab9fb5282ba4.zip
Provide _dlctl(), an alternate name for dlctl() that's in the reserved
namespace, for use by libpthread ok deraadt@
-rw-r--r--libexec/ld.so/Symbols.map3
-rw-r--r--libexec/ld.so/dlfcn.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/libexec/ld.so/Symbols.map b/libexec/ld.so/Symbols.map
index af566489485..e167f603dfe 100644
--- a/libexec/ld.so/Symbols.map
+++ b/libexec/ld.so/Symbols.map
@@ -11,6 +11,9 @@
environ;
__progname;
+ /* alias in reserved namespace for libpthread to use */
+ _dlctl;
+
/* looked up by gdb */
_dl_bind;
_dl_debug_state;
diff --git a/libexec/ld.so/dlfcn.c b/libexec/ld.so/dlfcn.c
index e9ffbb3dc69..68a48a73e27 100644
--- a/libexec/ld.so/dlfcn.c
+++ b/libexec/ld.so/dlfcn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dlfcn.c,v 1.94 2016/03/20 02:29:51 guenther Exp $ */
+/* $OpenBSD: dlfcn.c,v 1.95 2016/03/21 01:52:45 guenther Exp $ */
/*
* Copyright (c) 1998 Per Fogelstrom, Opsycon AB
@@ -251,6 +251,7 @@ dlctl(void *handle, int command, void *data)
}
return (retval);
}
+__strong_alias(_dlctl,dlctl);
int
dlclose(void *handle)