[src/trunk]: src/sys/kern addresses PR/47512

[para <para%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e5d420d83ea9
branches:  trunk
changeset: 786135:e5d420d83ea9
user:      para <para%NetBSD.org@localhost>
date:      Tue Apr 16 21:13:38 2013 +0000

description:
addresses PR/47512
properly return NULL for failed allocations not 0x8 with size checks enabled.

diffstat:

 sys/kern/subr_kmem.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r be57df848528 -r e5d420d83ea9 sys/kern/subr_kmem.c
--- a/sys/kern/subr_kmem.c      Tue Apr 16 21:01:09 2013 +0000
+++ b/sys/kern/subr_kmem.c      Tue Apr 16 21:13:38 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: subr_kmem.c,v 1.46 2012/07/21 11:45:04 para Exp $      */
+/*     $NetBSD: subr_kmem.c,v 1.47 2013/04/16 21:13:38 para Exp $      */
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_kmem.c,v 1.46 2012/07/21 11:45:04 para Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_kmem.c,v 1.47 2013/04/16 21:13:38 para Exp $");
 
 #include <sys/param.h>
 #include <sys/callback.h>
@@ -226,8 +226,10 @@
                kmem_poison_check(p, size);
                FREECHECK_OUT(&kmem_freecheck, p);
                kmem_size_set(p, size);
+
+               return p + SIZE_SIZE;
        }
-       return p + SIZE_SIZE;
+       return p;
 }
 
 /*