Module Name: src
Committed By: skrll
Date: Fri Jul 3 08:19:20 UTC 2020
Modified Files:
src/sys/kern: subr_asan.c
Log Message:
Make this compile/work on 32-bit archs. OK'ed my maxv
I thought about uintptr_t, but didn't change from Elf_Addr
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/kern/subr_asan.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_asan.c
diff -u src/sys/kern/subr_asan.c:1.22 src/sys/kern/subr_asan.c:1.23
--- src/sys/kern/subr_asan.c:1.22 Tue Jun 30 16:20:02 2020
+++ src/sys/kern/subr_asan.c Fri Jul 3 08:19:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_asan.c,v 1.22 2020/06/30 16:20:02 maxv Exp $ */
+/* $NetBSD: subr_asan.c,v 1.23 2020/07/03 08:19:20 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.22 2020/06/30 16:20:02 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_asan.c,v 1.23 2020/07/03 08:19:20 skrll Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -122,9 +122,9 @@ kasan_shadow_map(void *addr, size_t size
static void
kasan_ctors(void)
{
- extern uint64_t __CTOR_LIST__, __CTOR_END__;
+ extern Elf_Addr __CTOR_LIST__, __CTOR_END__;
size_t nentries, i;
- uint64_t *ptr;
+ Elf_Addr *ptr;
nentries = ((size_t)&__CTOR_END__ - (size_t)&__CTOR_LIST__) /
sizeof(uintptr_t);
