Module Name: src Committed By: para Date: Tue Apr 16 21:13:39 UTC 2013
Modified Files: src/sys/kern: subr_kmem.c Log Message: addresses PR/47512 properly return NULL for failed allocations not 0x8 with size checks enabled. To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/sys/kern/subr_kmem.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/kern/subr_kmem.c diff -u src/sys/kern/subr_kmem.c:1.46 src/sys/kern/subr_kmem.c:1.47 --- src/sys/kern/subr_kmem.c:1.46 Sat Jul 21 11:45:04 2012 +++ src/sys/kern/subr_kmem.c Tue Apr 16 21:13:38 2013 @@ -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_intr_alloc(size_t size, km_flag_t k 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; } /*