don't write openpty results until success is determined

[musl] / src / mman / mmap.c

diff --git a/src/mman/mmap.c b/src/mman/mmap.c
index b56cff8..56e39a7 100644 (file)
--- a/src/mman/mmap.c
+++ b/src/mman/mmap.c
@@ -11,12 +11,11 @@ static void dummy0(void) { }
 weak_alias(dummy1, __vm_lock);
 weak_alias(dummy0, __vm_unlock);
 
-#define OFF_MASK ((-0x2000ULL << (8*sizeof(long)-1)) | 0xfff)
+#define UNIT SYSCALL_MMAP2_UNIT
+#define OFF_MASK ((-0x2000ULL << (8*sizeof(long)-1)) | (UNIT-1))
 
 void *__mmap(void *start, size_t len, int prot, int flags, int fd, off_t off)
 {
-       void *ret;
-
        if (off & OFF_MASK) {
                errno = EINVAL;
                return MAP_FAILED;
@@ -25,14 +24,15 @@ void *__mmap(void *start, size_t len, int prot, int flags, int fd, off_t off)
                errno = ENOMEM;
                return MAP_FAILED;
        }
-       if (flags & MAP_FIXED) __vm_lock(-1);
+       if (flags & MAP_FIXED) {
+               __vm_lock(-1);
+               __vm_unlock();
+       }
 #ifdef SYS_mmap2
-       ret = (void *)syscall(SYS_mmap2, start, len, prot, flags, fd, off>>12);
+       return (void *)syscall(SYS_mmap2, start, len, prot, flags, fd, off/UNIT);
 #else
-       ret = (void *)syscall(SYS_mmap, start, len, prot, flags, fd, off);
+       return (void *)syscall(SYS_mmap, start, len, prot, flags, fd, off);
 #endif
-       if (flags & MAP_FIXED) __vm_unlock();
-       return ret;
 }
 
 weak_alias(__mmap, mmap);