X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fmman%2Fmremap.c;h=cc6991a635e1d2e2eb82f8f24fc39534901d6502;hb=c499c1084eaccd83e4b6e60883a5d92df0202c5e;hp=596c45fbded8426fc0ef19e03c3de5943ae629d3;hpb=aa398f56fa398f2202b04e82c67f822f3233786f;p=musl

diff --git a/src/mman/mremap.c b/src/mman/mremap.c
index 596c45fb..cc6991a6 100644
--- a/src/mman/mremap.c
+++ b/src/mman/mremap.c
@@ -1,17 +1,30 @@
+#define _GNU_SOURCE
 #include <unistd.h>
 #include <sys/mman.h>
+#include <errno.h>
+#include <stdint.h>
 #include <stdarg.h>
 #include "syscall.h"
-#include "libc.h"
+
+static void dummy(void) { }
+weak_alias(dummy, __vm_wait);
 
 void *__mremap(void *old_addr, size_t old_len, size_t new_len, int flags, ...)
 {
 	va_list ap;
-	void *new_addr;
-	
-	va_start(ap, flags);
-	new_addr = va_arg(ap, void *);
-	va_end(ap);
+	void *new_addr = 0;
+
+	if (new_len >= PTRDIFF_MAX) {
+		errno = ENOMEM;
+		return MAP_FAILED;
+	}
+
+	if (flags & MREMAP_FIXED) {
+		__vm_wait();
+		va_start(ap, flags);
+		new_addr = va_arg(ap, void *);
+		va_end(ap);
+	}
 
 	return (void *)syscall(SYS_mremap, old_addr, old_len, new_len, flags, new_addr);
 }