 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_malloc.c,v 1.135 2012/01/28 23:09:06 rmind Exp $	*/
+/*	$NetBSD: kern_malloc.c,v 1.136 2012/01/30 01:56:47 rmind Exp $	*/
 /*
  * Copyright (c) 1987, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -56,70 +56,70 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)kern_malloc.c	8.4 (Berkeley) 5/20/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_malloc.c,v 1.135 2012/01/28 23:09:06 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_malloc.c,v 1.136 2012/01/30 01:56:47 rmind Exp $");
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/kmem.h>
 #include <sys/systm.h>
 #include <sys/debug.h>
 #include <sys/mutex.h>
 #include <sys/lockdebug.h>
 #include <uvm/uvm_extern.h>
 #include "opt_kmemstats.h"
 #include "opt_malloclog.h"
 #include "opt_malloc_debug.h"
 struct kmembuckets kmembuckets[MINBUCKET + 16];
 struct kmemusage *kmemusage;
 struct malloc_type *kmemstatistics;
 kmutex_t malloc_lock;
 struct malloc_header {
-	size_t mh_size;
+	/* Total size, include the header. */
 	size_t		mh_size;
 };
 /*
  * Allocate a block of memory
  */
 #ifdef MALLOCLOG
 void *
 _kern_malloc(unsigned long size, struct malloc_type *ksp, int flags,
     const char *file, long line)
 #else
 void *
 kern_malloc(unsigned long size, struct malloc_type *ksp, int flags)
 #endif /* MALLOCLOG */
+{
 	const int kmflags = (flags & M_NOWAIT) ? KM_NOSLEEP : KM_SLEEP;
 	const size_t allocsize = sizeof(struct malloc_header) + size;
 	struct malloc_header *mh;
 	int kmflags = ((flags & M_NOWAIT) != 0
 	    ? KM_NOSLEEP : KM_SLEEP);
 	size_t allocsize = sizeof(struct malloc_header) + size;
 	void *p;
 	p = kmem_intr_alloc(allocsize, kmflags);
 	if (p == NULL)
 		return NULL;
 	if ((flags & M_ZERO) != 0) {
 		memset(p, 0, allocsize);
+	}
 	mh = (void *)p;
 	mh->mh_size = allocsize;
 	return mh + 1;
 @@ -168,27 +168,27 @@ kern_realloc(void *curaddr, unsigned lon
 		free(curaddr, ksp);
 		return (NULL);
+	}
 #ifdef LOCKDEBUG
 	if ((flags & M_NOWAIT) == 0) {
 		ASSERT_SLEEPABLE();
+	}
 #endif
 	mh = curaddr;
 	mh--;
-	cursize = mh->mh_size;
+	cursize = mh->mh_size - sizeof(struct malloc_header);
 	/*
 	 * If we already actually have as much as they want, we're done.
 	 */
 	if (newsize <= cursize)
 		return (curaddr);
 	/*
 	 * Can't satisfy the allocation with the existing block.
 	 * Allocate a new one and copy the data.
 	 */
 	newaddr = malloc(newsize, ksp, flags);
 	if (__predict_false(newaddr == NULL)) {