The branch main has been updated by markj:
URL:
https://cgit.FreeBSD.org/src/commit/?id=afd096326aad1a672fd5f39b9b05c433fa7fe7dc
commit afd096326aad1a672fd5f39b9b05c433fa7fe7dc
Author: Mark Johnston <ma...@freebsd.org>
AuthorDate: 2024-09-14 01:36:44 +0000
Commit: Mark Johnston <ma...@freebsd.org>
CommitDate: 2024-09-14 01:36:44 +0000
kassert: Further remove KASAN integration from DEBUG_POISON_POINTER
Fixes: 47112d359b36 ("kassert: Remove KASAN marking from
DEBUG_POISON_POINTER")
---
sys/sys/kassert.h | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/sys/sys/kassert.h b/sys/sys/kassert.h
index 8dcea8352fdf..7755a241888f 100644
--- a/sys/sys/kassert.h
+++ b/sys/sys/kassert.h
@@ -47,14 +47,10 @@ extern const char *panicstr; /* panic message */
*
* DEBUG_POISON_POINTER(obj->ptr);
* ....
- * if (obj->ptr != NULL) // traps with kasan, does not trap otherwise
- * ....
- * if (obj->ptr->field) // traps with and without kasan
+ * if (obj->ptr->field) // traps
*/
#ifdef INVARIANTS
-#include <sys/asan.h>
-
extern caddr_t poisoned_buf;
#define DEBUG_POISON_POINTER_VALUE poisoned_buf
