X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmman%2Fmmap.c;h=eff88d82a8fcff843247a5436f42016690daac24;hb=bd3b9c4ca5e93f10f7fd891b8c07cc0c5dfd198f;hp=19caadbdb6ef75da3df74f1edb9f06bf8aeaa541;hpb=2577b1bc16124d0690b9dd268a9f582f80bdcd67;p=musl

diff --git a/src/mman/mmap.c b/src/mman/mmap.c
index 19caadbd..eff88d82 100644
--- a/src/mman/mmap.c
+++ b/src/mman/mmap.c
@@ -4,7 +4,6 @@
 #include <stdint.h>
 #include <limits.h>
 #include "syscall.h"
-#include "libc.h"
 
 static void dummy(void) { }
 weak_alias(dummy, __vm_wait);
@@ -14,6 +13,7 @@ weak_alias(dummy, __vm_wait);
 
 void *__mmap(void *start, size_t len, int prot, int flags, int fd, off_t off)
 {
+	long ret;
 	if (off & OFF_MASK) {
 		errno = EINVAL;
 		return MAP_FAILED;
@@ -26,12 +26,16 @@ void *__mmap(void *start, size_t len, int prot, int flags, int fd, off_t off)
 		__vm_wait();
 	}
 #ifdef SYS_mmap2
-	return (void *)syscall(SYS_mmap2, start, len, prot, flags, fd, off/UNIT);
+	ret = __syscall(SYS_mmap2, start, len, prot, flags, fd, off/UNIT);
 #else
-	return (void *)syscall(SYS_mmap, start, len, prot, flags, fd, off);
+	ret = __syscall(SYS_mmap, start, len, prot, flags, fd, off);
 #endif
+	/* Fixup incorrect EPERM from kernel. */
+	if (ret == -EPERM && !start && (flags&MAP_ANON) && !(flags&MAP_FIXED))
+		ret = -ENOMEM;
+	return (void *)__syscall_ret(ret);
 }
 
 weak_alias(__mmap, mmap);
 
-LFS64(mmap);
+weak_alias(mmap, mmap64);