svn commit: r333847 - head/sys/kern

[Matt Macy]

Author: mmacy
Date: Sat May 19 04:43:49 2018
New Revision: 333847
URL: https://svnweb.freebsd.org/changeset/base/333847

Log:
  malloc: avoid possibly returning stack garbage if MALLOC_DEBUG is defined

Modified:
  head/sys/kern/kern_malloc.c

Modified: head/sys/kern/kern_malloc.c
==============================================================================
--- head/sys/kern/kern_malloc.c	Sat May 19 04:21:50 2018	(r333846)
+++ head/sys/kern/kern_malloc.c	Sat May 19 04:43:49 2018	(r333847)
@@ -559,6 +559,7 @@ malloc(size_t size, struct malloc_type *mtp, int flags
 #endif
 
 #ifdef MALLOC_DEBUG
+	va = NULL;
 	if (malloc_dbg(&va, &size, mtp, flags) != 0)
 		return (va);
 #endif
@@ -604,6 +605,7 @@ malloc_domain(size_t size, struct malloc_type *mtp, in
 #endif
 
 #ifdef MALLOC_DEBUG
+	va = NULL;
 	if (malloc_dbg(&va, &size, mtp, flags) != 0)
 		return (va);
 #endif