summaryrefslogtreecommitdiffstats
path: root/sys/kern/kern_malloc.c
diff options
context:
space:
mode:
authortedu <tedu@openbsd.org>2014-05-19 14:30:03 +0000
committertedu <tedu@openbsd.org>2014-05-19 14:30:03 +0000
commit2d02adf8285b02d67be5c9379a7f5b0c41bae06d (patch)
tree002470ff07d2ea986b86339477bf578411c55ab7 /sys/kern/kern_malloc.c
parentAdd some consistency in fuse error handling. We need to return ENXIO (diff)
downloadwireguard-openbsd-2d02adf8285b02d67be5c9379a7f5b0c41bae06d.tar.xz
wireguard-openbsd-2d02adf8285b02d67be5c9379a7f5b0c41bae06d.zip
consistent use of uint32_t for poison values
Diffstat (limited to 'sys/kern/kern_malloc.c')
-rw-r--r--sys/kern/kern_malloc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 1862aa171cd..96e90d3e048 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_malloc.c,v 1.106 2014/04/03 21:36:59 tedu Exp $ */
+/* $OpenBSD: kern_malloc.c,v 1.107 2014/05/19 14:30:03 tedu Exp $ */
/* $NetBSD: kern_malloc.c,v 1.15.4.2 1996/06/13 17:10:56 cgd Exp $ */
/*
@@ -325,7 +325,7 @@ malloc(unsigned long size, int type, int flags)
/* and check that the data hasn't been modified. */
if (freshalloc == 0) {
size_t pidx;
- int pval;
+ uint32_t pval;
if (poison_check(va, allocsize, &pidx, &pval)) {
panic("%s %zd of object %p size 0x%lx %s %s"
" (0x%x != 0x%x)\n",