Module Name: src
Committed By: maxv
Date: Thu Mar 7 18:32:10 UTC 2019
Modified Files:
src/sys/kern: kern_malloc.c
Log Message:
Mmh, fix len, mh_size includes the malloc header, but we don't redzone it.
To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/sys/kern/kern_malloc.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/kern_malloc.c
diff -u src/sys/kern/kern_malloc.c:1.155 src/sys/kern/kern_malloc.c:1.156
--- src/sys/kern/kern_malloc.c:1.155 Sun Dec 23 12:15:01 2018
+++ src/sys/kern/kern_malloc.c Thu Mar 7 18:32:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_malloc.c,v 1.155 2018/12/23 12:15:01 maxv Exp $ */
+/* $NetBSD: kern_malloc.c,v 1.156 2019/03/07 18:32:10 maxv Exp $ */
/*
* Copyright (c) 1987, 1991, 1993
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_malloc.c,v 1.155 2018/12/23 12:15:01 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_malloc.c,v 1.156 2019/03/07 18:32:10 maxv Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -152,7 +152,8 @@ kern_free(void *addr)
mh = addr;
mh--;
- kasan_mark(addr, mh->mh_size, mh->mh_size);
+ kasan_mark(addr, mh->mh_size - sizeof(struct malloc_header),
+ mh->mh_size - sizeof(struct malloc_header));
if (mh->mh_size >= PAGE_SIZE + sizeof(struct malloc_header))
kmem_intr_free((char *)addr - PAGE_SIZE,
