summaryrefslogtreecommitdiff
path: root/src/ldso
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2016-01-25 18:51:33 -0500
committerRich Felker <dalias@aerifal.cx>2016-01-25 18:51:33 -0500
commit891e6547b4fdec10fe4ffa3b1ef5ddb524bcde39 (patch)
tree719297d6a87f705f73a38e1f4cf5783206c2811c /src/ldso
parent4f8f038060739eca4c5cb97bb067529be96658d2 (diff)
downloadmusl-891e6547b4fdec10fe4ffa3b1ef5ddb524bcde39.tar.gz
musl-891e6547b4fdec10fe4ffa3b1ef5ddb524bcde39.tar.bz2
musl-891e6547b4fdec10fe4ffa3b1ef5ddb524bcde39.tar.xz
musl-891e6547b4fdec10fe4ffa3b1ef5ddb524bcde39.zip
move static-linked stub invalid dso handle checking out of dynlink.c
Diffstat (limited to 'src/ldso')
-rw-r--r--src/ldso/dlerror.c12
-rw-r--r--src/ldso/dynlink.c17
2 files changed, 20 insertions, 9 deletions
diff --git a/src/ldso/dlerror.c b/src/ldso/dlerror.c
index 588828e9..378f0356 100644
--- a/src/ldso/dlerror.c
+++ b/src/ldso/dlerror.c
@@ -2,6 +2,7 @@
#include <stdlib.h>
#include <stdarg.h>
#include "pthread_impl.h"
+#include "libc.h"
char *dlerror()
{
@@ -50,3 +51,14 @@ void __dl_seterr(const char *fmt, ...)
__dl_vseterr(fmt, ap);
va_end(ap);
}
+
+__attribute__((__visibility__("hidden")))
+int __dl_invalid_handle(void *);
+
+static int stub_invalid_handle(void *h)
+{
+ __dl_seterr("Invalid library handle %p", (void *)h);
+ return 1;
+}
+
+weak_alias(stub_invalid_handle, __dl_invalid_handle);
diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c
index 8d793f26..4f857e5a 100644
--- a/src/ldso/dynlink.c
+++ b/src/ldso/dynlink.c
@@ -1733,7 +1733,8 @@ end:
return p;
}
-static int invalid_dso_handle(void *h)
+__attribute__((__visibility__("hidden")))
+int __dl_invalid_handle(void *h)
{
struct dso *p;
for (p=head; p; p=p->next) if (h==p) return 0;
@@ -1788,7 +1789,7 @@ static void *do_dlsym(struct dso *p, const char *s, void *ra)
return def.dso->funcdescs + (def.sym - def.dso->syms);
return laddr(def.dso, def.sym->st_value);
}
- if (invalid_dso_handle(p))
+ if (__dl_invalid_handle(p))
return 0;
if ((ght = p->ghashtab)) {
gh = gnu_hash(s);
@@ -1913,11 +1914,6 @@ int dl_iterate_phdr(int(*callback)(struct dl_phdr_info *info, size_t size, void
return ret;
}
#else
-static int invalid_dso_handle(void *h)
-{
- error("Invalid library handle %p", (void *)h);
- return 1;
-}
void *dlopen(const char *file, int mode)
{
error("Dynamic loading not supported");
@@ -1930,9 +1926,12 @@ void *__dlsym(void *restrict p, const char *restrict s, void *restrict ra)
}
#endif
+__attribute__((__visibility__("hidden")))
+int __dl_invalid_handle(void *);
+
int __dlinfo(void *dso, int req, void *res)
{
- if (invalid_dso_handle(dso)) return -1;
+ if (__dl_invalid_handle(dso)) return -1;
if (req != RTLD_DI_LINKMAP) {
error("Unsupported request %d", req);
return -1;
@@ -1943,7 +1942,7 @@ int __dlinfo(void *dso, int req, void *res)
int dlclose(void *p)
{
- return invalid_dso_handle(p);
+ return __dl_invalid_handle(p);
}
__attribute__((__visibility__("hidden")))