diff options
| author | Rich Felker <dalias@aerifal.cx> | 2015-06-17 17:21:46 +0000 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2015-06-17 17:21:46 +0000 |
| commit | 75eceb3ae824d54e865686c0c538551aeebf3372 (patch) | |
| tree | e6b3b7c367af9a1040c4f06161e957b050d1370e | |
| parent | 10d0268ccfab9152250eeeed3952ce3fed44131a (diff) | |
| download | musl-75eceb3ae824d54e865686c0c538551aeebf3372.tar.gz | |
ignore ENOSYS error from mprotect in pthread_create and dynamic linker
this error simply indicated a system without memory protection (NOMMU)
and should not cause failure in the caller.
| -rw-r--r-- | src/ldso/dynlink.c | 6 | ||||
| -rw-r--r-- | src/thread/pthread_create.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/ldso/dynlink.c b/src/ldso/dynlink.c index 71252d03..7e566933 100644 --- a/src/ldso/dynlink.c +++ b/src/ldso/dynlink.c @@ -536,7 +536,8 @@ static void *map_library(int fd, struct dso *dso) } for (i=0; ((size_t *)(base+dyn))[i]; i+=2) if (((size_t *)(base+dyn))[i]==DT_TEXTREL) { - if (mprotect(map, map_len, PROT_READ|PROT_WRITE|PROT_EXEC) < 0) + if (mprotect(map, map_len, PROT_READ|PROT_WRITE|PROT_EXEC) + && errno != ENOSYS) goto error; break; } @@ -927,7 +928,8 @@ static void reloc_all(struct dso *p) do_relocs(p, (void *)(p->base+dyn[DT_RELA]), dyn[DT_RELASZ], 3); if (head != &ldso && p->relro_start != p->relro_end && - mprotect(p->base+p->relro_start, p->relro_end-p->relro_start, PROT_READ) < 0) { + mprotect(p->base+p->relro_start, p->relro_end-p->relro_start, PROT_READ) + && errno != ENOSYS) { error("Error relocating %s: RELRO protection failed: %m", p->name); if (runtime) longjmp(*rtld_fail, 1); diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c index 6e2e4816..e7df34a9 100644 --- a/src/thread/pthread_create.c +++ b/src/thread/pthread_create.c @@ -232,7 +232,8 @@ int __pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict att if (guard) { map = __mmap(0, size, PROT_NONE, MAP_PRIVATE|MAP_ANON, -1, 0); if (map == MAP_FAILED) goto fail; - if (__mprotect(map+guard, size-guard, PROT_READ|PROT_WRITE)) { + if (__mprotect(map+guard, size-guard, PROT_READ|PROT_WRITE) + && errno != ENOSYS) { __munmap(map, size); goto fail; } |