projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix out-of-bounds access in UTF-8 decoding
[musl]
/
src
/
ldso
/
dynlink.c
diff --git
a/src/ldso/dynlink.c
b/src/ldso/dynlink.c
index
e73806c
..
efbec8f
100644
(file)
--- a/
src/ldso/dynlink.c
+++ b/
src/ldso/dynlink.c
@@
-99,6
+99,7
@@
static int ssp_used;
static int runtime;
static int ldd_mode;
static int ldso_fail;
static int runtime;
static int ldd_mode;
static int ldso_fail;
+static int noload;
static jmp_buf rtld_fail;
static pthread_rwlock_t lock;
static struct debug debug;
static jmp_buf rtld_fail;
static pthread_rwlock_t lock;
static struct debug debug;
@@
-434,7
+435,6
@@
static struct dso *load_library(const char *name)
char buf[2*NAME_MAX+2];
const char *pathname;
unsigned char *map;
char buf[2*NAME_MAX+2];
const char *pathname;
unsigned char *map;
- size_t map_len;
struct dso *p, temp_dso = {0};
int fd;
struct stat st;
struct dso *p, temp_dso = {0};
int fd;
struct stat st;
@@
-508,7
+508,7
@@
static struct dso *load_library(const char *name)
return p;
}
}
return p;
}
}
- map = map_library(fd, &temp_dso);
+ map =
noload ? 0 :
map_library(fd, &temp_dso);
close(fd);
if (!map) return 0;
close(fd);
if (!map) return 0;
@@
-527,7
+527,7
@@
static struct dso *load_library(const char *name)
}
p = calloc(1, alloc_size);
if (!p) {
}
p = calloc(1, alloc_size);
if (!p) {
- munmap(map, map_len);
+ munmap(map,
temp_dso.
map_len);
return 0;
}
memcpy(p, &temp_dso, sizeof temp_dso);
return 0;
}
memcpy(p, &temp_dso, sizeof temp_dso);
@@
-541,8
+541,8
@@
static struct dso *load_library(const char *name)
if (pathname != name) p->shortname = strrchr(p->name, '/')+1;
if (p->tls_image) {
if (runtime && !__pthread_self_init()) {
if (pathname != name) p->shortname = strrchr(p->name, '/')+1;
if (p->tls_image) {
if (runtime && !__pthread_self_init()) {
+ munmap(map, p->map_len);
free(p);
free(p);
- munmap(map, map_len);
return 0;
}
p->tls_id = ++tls_cnt;
return 0;
}
p->tls_id = ++tls_cnt;
@@
-1027,6
+1027,7
@@
void *dlopen(const char *file, int mode)
orig_tls_offset = tls_offset;
orig_tls_align = tls_align;
orig_tail = tail;
orig_tls_offset = tls_offset;
orig_tls_align = tls_align;
orig_tail = tail;
+ noload = mode & RTLD_NOLOAD;
if (setjmp(rtld_fail)) {
/* Clean up anything new that was (partially) loaded */
if (setjmp(rtld_fail)) {
/* Clean up anything new that was (partially) loaded */
@@
-1050,8
+1051,10
@@
void *dlopen(const char *file, int mode)
} else p = load_library(file);
if (!p) {
} else p = load_library(file);
if (!p) {
- snprintf(errbuf, sizeof errbuf,
- "Error loading shared library %s: %m", file);
+ snprintf(errbuf, sizeof errbuf, noload ?
+ "Library %s is not already loaded" :
+ "Error loading shared library %s: %m",
+ file);
errflag = 1;
goto end;
}
errflag = 1;
goto end;
}