Module Name: src
Committed By: skrll
Date: Fri Jul 10 07:48:28 UTC 2020
Modified Files:
src/sys/kern: subr_asan.c
src/sys/sys: asan.h
Log Message:
Expose KASAN_SHADOW_SCALE_SHIFT. OK'ed by maxv.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/kern/subr_asan.c
cvs rdiff -u -r1.13 -r1.14 src/sys/sys/asan.h
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_asan.c
diff -u src/sys/kern/subr_asan.c:1.23 src/sys/kern/subr_asan.c:1.24
--- src/sys/kern/subr_asan.c:1.23 Fri Jul 3 08:19:20 2020
+++ src/sys/kern/subr_asan.c Fri Jul 10 07:48:27 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_asan.c,v 1.23 2020/07/03 08:19:20 skrll Exp $ */
+/* $NetBSD: subr_asan.c,v 1.24 2020/07/10 07:48:27 skrll Exp $ */
/*
* Copyright (c) 2018-2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_asan.c,v 1.23 2020/07/03 08:19:20 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_asan.c,v 1.24 2020/07/10 07:48:27 skrll Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -50,7 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: subr_asan.c,
#endif
/* ASAN constants. Part of the compiler ABI. */
-#define KASAN_SHADOW_SCALE_SHIFT 3
#define KASAN_SHADOW_SCALE_SIZE (1UL << KASAN_SHADOW_SCALE_SHIFT)
#define KASAN_SHADOW_MASK (KASAN_SHADOW_SCALE_SIZE - 1)
#define KASAN_ALLOCA_SCALE_SIZE 32
Index: src/sys/sys/asan.h
diff -u src/sys/sys/asan.h:1.13 src/sys/sys/asan.h:1.14
--- src/sys/sys/asan.h:1.13 Sat Feb 8 09:05:08 2020
+++ src/sys/sys/asan.h Fri Jul 10 07:48:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: asan.h,v 1.13 2020/02/08 09:05:08 maxv Exp $ */
+/* $NetBSD: asan.h,v 1.14 2020/07/10 07:48:28 skrll Exp $ */
/*
* Copyright (c) 2018-2019 The NetBSD Foundation, Inc.
@@ -40,6 +40,9 @@
#include <sys/types.h>
#include <sys/bus.h>
+/* ASAN constants. Part of the compiler ABI. */
+#define KASAN_SHADOW_SCALE_SHIFT 3
+
/* Stack redzone values. Part of the compiler ABI. */
#define KASAN_STACK_LEFT 0xF1
#define KASAN_STACK_MID 0xF2
