X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/c22d8cc03dd54dcb03af8058e421eedf686d9e43..575a5eced126099bed926a05ff174b7a8c9f1612:/monitor_mm.c

diff --git a/monitor_mm.c b/monitor_mm.c
index 17b319cc..dab74753 100644
--- a/monitor_mm.c
+++ b/monitor_mm.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: monitor_mm.c,v 1.15 2006/08/03 03:34:42 deraadt Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * All rights reserved.
@@ -24,21 +25,34 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor_mm.c,v 1.5 2002/05/28 16:45:27 stevesk Exp $");
 
+#include <sys/types.h>
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #endif
+#include <sys/param.h>
+#include "openbsd-compat/sys-tree.h"
+
+#include <errno.h>
+#include <stdarg.h>
+#include <string.h>
 
-#include "ssh.h"
 #include "xmalloc.h"
+#include "ssh.h"
 #include "log.h"
 #include "monitor_mm.h"
 
 static int
 mm_compare(struct mm_share *a, struct mm_share *b)
 {
-	return ((char *)a->address - (char *)b->address);
+	long diff = (char *)a->address - (char *)b->address;
+
+	if (diff == 0)
+		return (0);
+	else if (diff < 0)
+		return (-1);
+	else
+		return (1);
 }
 
 RB_GENERATE(mmtree, mm_share, next, mm_compare)
@@ -84,15 +98,9 @@ mm_create(struct mm_master *mmalloc, size_t size)
 	 */
 	mm->mmalloc = mmalloc;
 
-#if  defined(HAVE_MMAP) && defined(MAP_ANON)
-	address = mmap(NULL, size, PROT_WRITE|PROT_READ, MAP_ANON|MAP_SHARED,
-	    -1, 0);
-	if (address == MAP_FAILED)
-		fatal("mmap(%lu): %s", (u_long)size, strerror(errnor));
-#else
-	fatal("%s: UsePrivilegeSeparation=yes not supported",
-	    __FUNCTION__);
-#endif
+	address = xmmap(size);
+	if (address == (void *)MAP_FAILED)
+		fatal("mmap(%lu): %s", (u_long)size, strerror(errno));
 
 	mm->address = address;
 	mm->size = size;
@@ -132,11 +140,11 @@ mm_destroy(struct mm_master *mm)
 
 #ifdef HAVE_MMAP
 	if (munmap(mm->address, mm->size) == -1)
-		fatal("munmap(%p, %lu): %s", mm->address, (u_long)mm->size
+		fatal("munmap(%p, %lu): %s", mm->address, (u_long)mm->size,
 		    strerror(errno));
 #else
-	fatal("%s: UsePrivilegeSeparation=yes not supported",
-	    __FUNCTION__);
+	fatal("%s: UsePrivilegeSeparation=yes and Compression=yes not supported",
+	    __func__);
 #endif
 	if (mm->mmalloc == NULL)
 		xfree(mm);
@@ -151,7 +159,7 @@ mm_xmalloc(struct mm_master *mm, size_t size)
 
 	address = mm_malloc(mm, size);
 	if (address == NULL)
-		fatal("%s: mm_malloc(%lu)", __FUNCTION__, (u_long)size);
+		fatal("%s: mm_malloc(%lu)", __func__, (u_long)size);
 	return (address);
 }
 
@@ -165,8 +173,10 @@ mm_malloc(struct mm_master *mm, size_t size)
 
 	if (size == 0)
 		fatal("mm_malloc: try to allocate 0 space");
+	if (size > SIZE_T_MAX - MM_MINSIZE + 1)
+		fatal("mm_malloc: size too big");
 
-	size = ((size + MM_MINSIZE - 1) / MM_MINSIZE) * MM_MINSIZE;
+	size = ((size + (MM_MINSIZE - 1)) / MM_MINSIZE) * MM_MINSIZE;
 
 	RB_FOREACH(mms, mmtree, &mm->rb_free) {
 		if (mms->size >= size)
@@ -300,7 +310,7 @@ mm_share_sync(struct mm_master **pmm, struct mm_master **pmmalloc)
 	struct mm_master *mmold;
 	struct mmtree rb_free, rb_allocated;
 
-	debug3("%s: Share sync", __FUNCTION__);
+	debug3("%s: Share sync", __func__);
 
 	mm = *pmm;
 	mmold = mm->mmalloc;
@@ -325,7 +335,7 @@ mm_share_sync(struct mm_master **pmm, struct mm_master **pmmalloc)
 	*pmm = mm;
 	*pmmalloc = mmalloc;
 
-	debug3("%s: Share sync end", __FUNCTION__);
+	debug3("%s: Share sync end", __func__);
 }
 
 void