math: fix undefined shift in logf

[musl] / src / mman / mmap.c

diff --git a/src/mman/mmap.c b/src/mman/mmap.c
index 93c7658..43e5e02 100644 (file)
--- a/src/mman/mmap.c
+++ b/src/mman/mmap.c
@@ -1,18 +1,39 @@
 #include <unistd.h>
 #include <sys/mman.h>
 #include <errno.h>
+#include <stdint.h>
 #include <limits.h>
 #include "syscall.h"
-#include "libc.h"
+
+static void dummy(void) { }
+weak_alias(dummy, __vm_wait);
+
+#define UNIT SYSCALL_MMAP2_UNIT
+#define OFF_MASK ((-0x2000ULL << (8*sizeof(syscall_arg_t)-1)) | (UNIT-1))
 
 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);
+       long ret;
+       if (off & OFF_MASK) {
+               errno = EINVAL;
+               return MAP_FAILED;
+       }
+       if (len >= PTRDIFF_MAX) {
+               errno = ENOMEM;
+               return MAP_FAILED;
+       }
+       if (flags & MAP_FIXED) {
+               __vm_wait();
+       }
+#ifdef SYS_mmap2
+       ret = __syscall(SYS_mmap2, start, len, prot, flags, fd, off/UNIT);
+#else
+       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);