X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmman%2Fmmap.c;h=e99271f7e5dd7092cf5b84201906527425151ed9;hb=43653c1250ad5eb5385d7e08292ad047420f8d25;hp=93c76582a5dfc77057e41c4b022098d5fc6c1067;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=musl

diff --git a/src/mman/mmap.c b/src/mman/mmap.c
index 93c76582..e99271f7 100644
--- a/src/mman/mmap.c
+++ b/src/mman/mmap.c
@@ -5,12 +5,29 @@
 #include "syscall.h"
 #include "libc.h"
 
+static void dummy1(int x) { }
+static void dummy0(void) { }
+weak_alias(dummy1, __vm_lock);
+weak_alias(dummy0, __vm_unlock);
+
+#define OFF_MASK ((-0x2000ULL << (8*sizeof(long)-1)) | 0xfff)
+
 void *__mmap(void *start, size_t len, int prot, int flags, int fd, off_t off)
 {
-	if (sizeof(off_t) > sizeof(long))
-		if (((long)off & 0xfff) | ((long)((unsigned long long)off>>(12 + 8*(sizeof(off_t)-sizeof(long))))))
-			start = (void *)-1;
-	return (void *)syscall6(__NR_mmap2, (long)start, len, prot, flags, fd, off>>12);
+	void *ret;
+
+	if (off & OFF_MASK) {
+		errno = EINVAL;
+		return MAP_FAILED;
+	}
+	if (flags & MAP_FIXED) __vm_lock(-1);
+#ifdef SYS_mmap2
+	ret = (void *)syscall(SYS_mmap2, start, len, prot, flags, fd, off>>12);
+#else
+	ret = (void *)syscall(SYS_mmap, start, len, prot, flags, fd, off);
+#endif
+	if (flags & MAP_FIXED) __vm_unlock();
+	return ret;
 }
 
 weak_alias(__mmap, mmap);