summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2013-09-22 23:47:56 +0000
committerdes <des@FreeBSD.org>2013-09-22 23:47:56 +0000
commit65c545bff143fb7ebecbf312e0f289f8604f770a (patch)
tree97d3cd5862a514bbf551b9064ada371772cedcfb
parent340e2ed8dbe5580459203833def634c2888db571 (diff)
downloadFreeBSD-src-65c545bff143fb7ebecbf312e0f289f8604f770a.zip
FreeBSD-src-65c545bff143fb7ebecbf312e0f289f8604f770a.tar.gz
Always request zeroed memory, in case we're dumb enough to leak it later.
Approved by: re (gjb)
-rw-r--r--sys/kern/subr_sbuf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/subr_sbuf.c b/sys/kern/subr_sbuf.c
index 68a7b15..1490bc6 100644
--- a/sys/kern/subr_sbuf.c
+++ b/sys/kern/subr_sbuf.c
@@ -52,11 +52,11 @@ __FBSDID("$FreeBSD$");
#ifdef _KERNEL
static MALLOC_DEFINE(M_SBUF, "sbuf", "string buffers");
-#define SBMALLOC(size) malloc(size, M_SBUF, M_WAITOK)
+#define SBMALLOC(size) malloc(size, M_SBUF, M_WAITOK|M_ZERO)
#define SBFREE(buf) free(buf, M_SBUF)
#else /* _KERNEL */
#define KASSERT(e, m)
-#define SBMALLOC(size) malloc(size)
+#define SBMALLOC(size) calloc(1, size)
#define SBFREE(buf) free(buf)
#endif /* _KERNEL */
OpenPOWER on IntegriCloud