Module Name: src
Committed By: riastradh
Date: Sat Mar 12 16:54:17 UTC 2022
Modified Files:
src/sys/kern: subr_kmem.c
Log Message:
kmem(9): Make kmem_alloc and kmem_free agree about rejecting zero.
Let's do both as KASSERT, unless there's a good reason to make them
both do an unconditional if/panic even in release builds.
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 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/subr_kmem.c
diff -u src/sys/kern/subr_kmem.c:1.82 src/sys/kern/subr_kmem.c:1.83
--- src/sys/kern/subr_kmem.c:1.82 Sat Feb 6 13:54:48 2021
+++ src/sys/kern/subr_kmem.c Sat Mar 12 16:54:17 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_kmem.c,v 1.82 2021/02/06 13:54:48 joerg Exp $ */
+/* $NetBSD: subr_kmem.c,v 1.83 2022/03/12 16:54:17 riastradh Exp $ */
/*
* Copyright (c) 2009-2020 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_kmem.c,v 1.82 2021/02/06 13:54:48 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_kmem.c,v 1.83 2022/03/12 16:54:17 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_kmem.h"
@@ -258,9 +258,7 @@ kmem_intr_free(void *p, size_t requested
pool_cache_t pc;
KASSERT(p != NULL);
- if (__predict_false(requested_size == 0)) {
- panic("%s: zero size with pointer %p", __func__, p);
- }
+ KASSERT(requested_size > 0);
kasan_add_redzone(&requested_size);
size = kmem_roundup_size(requested_size);
