Module Name: src
Committed By: christos
Date: Wed Aug 22 14:12:30 UTC 2018
Modified Files:
src/sys/kern: kern_malloc.c subr_kmem.c
Log Message:
- opt_kasan.h is included from <sys/asan.h>
- now that we are not using inlines, we need one more ifdef.
To generate a diff of this commit:
cvs rdiff -u -r1.152 -r1.153 src/sys/kern/kern_malloc.c
cvs rdiff -u -r1.70 -r1.71 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/kern_malloc.c
diff -u src/sys/kern/kern_malloc.c:1.152 src/sys/kern/kern_malloc.c:1.153
--- src/sys/kern/kern_malloc.c:1.152 Wed Aug 22 08:42:06 2018
+++ src/sys/kern/kern_malloc.c Wed Aug 22 10:12:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_malloc.c,v 1.152 2018/08/22 12:42:06 maxv Exp $ */
+/* $NetBSD: kern_malloc.c,v 1.153 2018/08/22 14:12:30 christos Exp $ */
/*
* Copyright (c) 1987, 1991, 1993
@@ -70,11 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_malloc.c,v 1.152 2018/08/22 12:42:06 maxv Exp $");
-
-#ifdef _KERNEL_OPT
-#include "opt_kasan.h"
-#endif
+__KERNEL_RCSID(0, "$NetBSD: kern_malloc.c,v 1.153 2018/08/22 14:12:30 christos Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -115,9 +111,7 @@ kern_malloc(unsigned long size, int flag
struct malloc_header *mh;
void *p;
-#ifdef KASAN
kasan_add_redzone(&size);
-#endif
if (size >= PAGE_SIZE) {
if (size > (ULONG_MAX-PAGE_SIZE))
@@ -144,9 +138,7 @@ kern_malloc(unsigned long size, int flag
#endif
mh++;
-#ifdef KASAN
kasan_alloc(mh, origsize, size);
-#endif
return mh;
}
@@ -159,9 +151,7 @@ kern_free(void *addr)
mh = addr;
mh--;
-#ifdef KASAN
kasan_free(addr, mh->mh_size);
-#endif
if (mh->mh_size >= PAGE_SIZE + sizeof(struct malloc_header))
kmem_intr_free((char *)addr - PAGE_SIZE,
Index: src/sys/kern/subr_kmem.c
diff -u src/sys/kern/subr_kmem.c:1.70 src/sys/kern/subr_kmem.c:1.71
--- src/sys/kern/subr_kmem.c:1.70 Wed Aug 22 05:38:21 2018
+++ src/sys/kern/subr_kmem.c Wed Aug 22 10:12:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_kmem.c,v 1.70 2018/08/22 09:38:21 maxv Exp $ */
+/* $NetBSD: subr_kmem.c,v 1.71 2018/08/22 14:12:30 christos Exp $ */
/*-
* Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
@@ -92,11 +92,10 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_kmem.c,v 1.70 2018/08/22 09:38:21 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_kmem.c,v 1.71 2018/08/22 14:12:30 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_kmem.h"
-#include "opt_kasan.h"
#endif
#include <sys/param.h>
@@ -224,7 +223,9 @@ CTASSERT(KM_NOSLEEP == PR_NOWAIT);
void *
kmem_intr_alloc(size_t requested_size, km_flag_t kmflags)
{
+#ifdef KASAN
const size_t origsize = requested_size;
+#endif
size_t allocsz, index;
size_t size;
pool_cache_t pc;
