Module Name: src
Committed By: maxv
Date: Thu Nov 1 20:34:50 UTC 2018
Modified Files:
src/sys/arch/aarch64/aarch64: aarch64_machdep.c pmap.c
src/sys/arch/aarch64/conf: Makefile.aarch64 kern.ldscript
src/sys/arch/aarch64/include: pmap.h
src/sys/arch/evbarm/conf: GENERIC64
Added Files:
src/sys/arch/aarch64/include: asan.h
src/sys/arch/evbarm/include: asan.h
Log Message:
Add kASan support for aarch64. Stack tracking needs more investigation
and will come in a separate commit.
Reviewed by ryo@ jmcneill@ skrll@.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/aarch64/aarch64/aarch64_machdep.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/aarch64/aarch64/pmap.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/aarch64/conf/Makefile.aarch64
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/aarch64/conf/kern.ldscript
cvs rdiff -u -r0 -r1.1 src/sys/arch/aarch64/include/asan.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/aarch64/include/pmap.h
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/evbarm/conf/GENERIC64
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/include/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/arch/aarch64/aarch64/aarch64_machdep.c
diff -u src/sys/arch/aarch64/aarch64/aarch64_machdep.c:1.17 src/sys/arch/aarch64/aarch64/aarch64_machdep.c:1.18
--- src/sys/arch/aarch64/aarch64/aarch64_machdep.c:1.17 Wed Oct 31 13:42:24 2018
+++ src/sys/arch/aarch64/aarch64/aarch64_machdep.c Thu Nov 1 20:34:49 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: aarch64_machdep.c,v 1.17 2018/10/31 13:42:24 jmcneill Exp $ */
+/* $NetBSD: aarch64_machdep.c,v 1.18 2018/11/01 20:34:49 maxv Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,10 +30,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: aarch64_machdep.c,v 1.17 2018/10/31 13:42:24 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: aarch64_machdep.c,v 1.18 2018/11/01 20:34:49 maxv Exp $");
#include "opt_arm_debug.h"
#include "opt_ddb.h"
+#include "opt_kasan.h"
#include "opt_kernhist.h"
#include "opt_modular.h"
#include "opt_fdt.h"
@@ -46,6 +47,7 @@ __KERNEL_RCSID(1, "$NetBSD: aarch64_mach
#include <sys/msgbuf.h>
#include <sys/sysctl.h>
#include <sys/reboot.h>
+#include <sys/asan.h>
#include <dev/mm.h>
@@ -358,6 +360,10 @@ initarm_common(vaddr_t kvm_base, vsize_t
*/
pmap_bootstrap(kernelvmstart, VM_MAX_KERNEL_ADDRESS);
+#ifdef KASAN
+ kasan_init();
+#endif
+
/*
* setup lwp0
*/
Index: src/sys/arch/aarch64/aarch64/pmap.c
diff -u src/sys/arch/aarch64/aarch64/pmap.c:1.32 src/sys/arch/aarch64/aarch64/pmap.c:1.33
--- src/sys/arch/aarch64/aarch64/pmap.c:1.32 Wed Oct 31 06:36:19 2018
+++ src/sys/arch/aarch64/aarch64/pmap.c Thu Nov 1 20:34:49 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.32 2018/10/31 06:36:19 ryo Exp $ */
+/* $NetBSD: pmap.c,v 1.33 2018/11/01 20:34:49 maxv Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <[email protected]>
@@ -27,10 +27,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.32 2018/10/31 06:36:19 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.33 2018/11/01 20:34:49 maxv Exp $");
#include "opt_arm_debug.h"
#include "opt_ddb.h"
+#include "opt_kasan.h"
#include "opt_multiprocessor.h"
#include "opt_pmap.h"
#include "opt_uvmhist.h"
@@ -40,6 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.3
#include <sys/kmem.h>
#include <sys/vmem.h>
#include <sys/atomic.h>
+#include <sys/asan.h>
#include <uvm/uvm.h>
@@ -1407,6 +1409,12 @@ _pmap_enter(struct pmap *pm, vaddr_t va,
#endif
need_sync_icache = (prot & VM_PROT_EXECUTE);
+#ifdef KASAN
+ if (!user) {
+ kasan_shadow_map((void *)va, PAGE_SIZE);
+ }
+#endif
+
if (l3pte_valid(pte)) {
KASSERT(!kenter); /* pmap_kenter_pa() cannot override */
Index: src/sys/arch/aarch64/conf/Makefile.aarch64
diff -u src/sys/arch/aarch64/conf/Makefile.aarch64:1.12 src/sys/arch/aarch64/conf/Makefile.aarch64:1.13
--- src/sys/arch/aarch64/conf/Makefile.aarch64:1.12 Sat Sep 22 12:24:01 2018
+++ src/sys/arch/aarch64/conf/Makefile.aarch64 Thu Nov 1 20:34:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.aarch64,v 1.12 2018/09/22 12:24:01 rin Exp $
+# $NetBSD: Makefile.aarch64,v 1.13 2018/11/01 20:34:49 maxv Exp $
# Makefile for NetBSD
#
@@ -39,6 +39,14 @@ CFLAGS+= -fno-omit-frame-pointer
CFLAGS+= -mno-omit-leaf-frame-pointer
#CFLAGS+= -mno-unaligned-access
+.if ${KASAN:U0} > 0 && ${HAVE_GCC:U0} > 0
+KASANFLAGS= -fsanitize=kernel-address \
+ --param asan-globals=1
+.for f in subr_asan.c
+KASANFLAGS.${f}= # empty
+.endfor
+CFLAGS+= ${KASANFLAGS.${.IMPSRC:T}:U${KASANFLAGS}}
+.endif
##
## (3) libkern and compat
Index: src/sys/arch/aarch64/conf/kern.ldscript
diff -u src/sys/arch/aarch64/conf/kern.ldscript:1.10 src/sys/arch/aarch64/conf/kern.ldscript:1.11
--- src/sys/arch/aarch64/conf/kern.ldscript:1.10 Sun Oct 7 18:03:59 2018
+++ src/sys/arch/aarch64/conf/kern.ldscript Thu Nov 1 20:34:49 2018
@@ -24,6 +24,11 @@ SECTIONS
{
*(.rodata)
*(.rodata.*)
+ . = ALIGN(64);
+ __CTOR_LIST__ = .;
+ *(.ctors)
+ *(.init_array)
+ __CTOR_END__ = .;
}
PROVIDE(_etext = .);
Index: src/sys/arch/aarch64/include/pmap.h
diff -u src/sys/arch/aarch64/include/pmap.h:1.16 src/sys/arch/aarch64/include/pmap.h:1.17
--- src/sys/arch/aarch64/include/pmap.h:1.16 Thu Oct 18 09:01:51 2018
+++ src/sys/arch/aarch64/include/pmap.h Thu Nov 1 20:34:50 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.16 2018/10/18 09:01:51 skrll Exp $ */
+/* $NetBSD: pmap.h,v 1.17 2018/11/01 20:34:50 maxv Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -35,6 +35,10 @@
#ifdef __aarch64__
#ifdef _KERNEL
+#ifdef _KERNEL_OPT
+#include "opt_kasan.h"
+#endif
+
#include <sys/types.h>
#include <sys/pool.h>
#include <sys/queue.h>
@@ -47,9 +51,10 @@
#define __HAVE_VM_PAGE_MD
+#ifndef KASAN
#define PMAP_MAP_POOLPAGE(pa) AARCH64_PA_TO_KVA(pa)
#define PMAP_UNMAP_POOLPAGE(va) AARCH64_KVA_TO_PA(va)
-
+#endif
struct pmap {
kmutex_t pm_lock;
Index: src/sys/arch/evbarm/conf/GENERIC64
diff -u src/sys/arch/evbarm/conf/GENERIC64:1.61 src/sys/arch/evbarm/conf/GENERIC64:1.62
--- src/sys/arch/evbarm/conf/GENERIC64:1.61 Sun Oct 28 10:21:42 2018
+++ src/sys/arch/evbarm/conf/GENERIC64 Thu Nov 1 20:34:50 2018
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC64,v 1.61 2018/10/28 10:21:42 jmcneill Exp $
+# $NetBSD: GENERIC64,v 1.62 2018/11/01 20:34:50 maxv Exp $
#
# GENERIC ARM (aarch64) kernel
#
@@ -85,6 +85,10 @@ options VERBOSE_INIT_ARM # verbose boot
#options EARLYCONS=thunderx, CONSADDR=0x87e024000000
#options EARLYCONS=virt
+# Kernel Address Sanitizer (kASan).
+#makeoptions KASAN=1 # Kernel Address Sanitizer
+#options KASAN
+
makeoptions DEBUG="-g" # compile full symbol table
makeoptions COPY_SYMTAB=1
Added files:
Index: src/sys/arch/aarch64/include/asan.h
diff -u /dev/null src/sys/arch/aarch64/include/asan.h:1.1
--- /dev/null Thu Nov 1 20:34:50 2018
+++ src/sys/arch/aarch64/include/asan.h Thu Nov 1 20:34:50 2018
@@ -0,0 +1,136 @@
+/* $NetBSD: asan.h,v 1.1 2018/11/01 20:34:50 maxv Exp $ */
+
+/*
+ * Copyright (c) 2018 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Maxime Villard.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/atomic.h>
+#include <aarch64/pmap.h>
+#include <aarch64/vmparam.h>
+#include <aarch64/cpufunc.h>
+#include <aarch64/armreg.h>
+
+#define __MD_VIRTUAL_SHIFT 48 /* 49bit address space, cut half */
+#define __MD_CANONICAL_BASE 0xFFFF000000000000
+
+#define __MD_SHADOW_SIZE (1ULL << (__MD_VIRTUAL_SHIFT - KASAN_SHADOW_SCALE_SHIFT))
+#define KASAN_MD_SHADOW_START (AARCH64_KSEG_END)
+#define KASAN_MD_SHADOW_END (KASAN_MD_SHADOW_START + __MD_SHADOW_SIZE)
+
+static inline int8_t *
+kasan_md_addr_to_shad(const void *addr)
+{
+ vaddr_t va = (vaddr_t)addr;
+ return (int8_t *)(KASAN_MD_SHADOW_START +
+ ((va - __MD_CANONICAL_BASE) >> KASAN_SHADOW_SCALE_SHIFT));
+}
+
+static inline bool
+kasan_md_unsupported(vaddr_t addr)
+{
+ return (addr < VM_MIN_KERNEL_ADDRESS) ||
+ (addr >= VM_KERNEL_IO_ADDRESS);
+}
+
+static paddr_t
+__md_palloc(void)
+{
+ paddr_t pa;
+
+ pmap_alloc_pdp(pmap_kernel(), &pa);
+
+ return pa;
+}
+
+static void
+kasan_md_shadow_map_page(vaddr_t va)
+{
+ pd_entry_t *l0, *l1, *l2, *l3;
+ paddr_t l0pa, pa;
+ pd_entry_t pde;
+ size_t idx;
+
+ l0pa = reg_ttbr1_el1_read();
+ l0 = (void *)AARCH64_PA_TO_KVA(l0pa);
+
+ idx = l0pde_index(va);
+ pde = l0[idx];
+ if (!l0pde_valid(pde)) {
+ pa = __md_palloc();
+ atomic_swap_64(&l0[idx], pa | L0_TABLE);
+ } else {
+ pa = l0pde_pa(pde);
+ }
+ l1 = (void *)AARCH64_PA_TO_KVA(pa);
+
+ idx = l1pde_index(va);
+ pde = l1[idx];
+ if (!l1pde_valid(pde)) {
+ pa = __md_palloc();
+ atomic_swap_64(&l1[idx], pa | L1_TABLE);
+ } else {
+ pa = l1pde_pa(pde);
+ }
+ l2 = (void *)AARCH64_PA_TO_KVA(pa);
+
+ idx = l2pde_index(va);
+ pde = l2[idx];
+ if (!l2pde_valid(pde)) {
+ pa = __md_palloc();
+ atomic_swap_64(&l2[idx], pa | L2_TABLE);
+ } else {
+ pa = l2pde_pa(pde);
+ }
+ l3 = (void *)AARCH64_PA_TO_KVA(pa);
+
+ idx = l3pte_index(va);
+ pde = l3[idx];
+ if (!l3pte_valid(pde)) {
+ pa = __md_palloc();
+ atomic_swap_64(&l3[idx], pa | L3_PAGE | LX_BLKPAG_UXN |
+ LX_BLKPAG_PXN | LX_BLKPAG_AF | LX_BLKPAG_AP_RW);
+ aarch64_tlbi_by_va(va);
+ }
+}
+
+#define kasan_md_early_init(a) __nothing
+
+static void
+kasan_md_init(void)
+{
+ vaddr_t eva, dummy;
+
+ CTASSERT((__MD_SHADOW_SIZE / L0_SIZE) == 64);
+
+ /* The VAs we've created until now. */
+ pmap_virtual_space(&eva, &dummy);
+ kasan_shadow_map((void *)VM_MIN_KERNEL_ADDRESS,
+ eva - VM_MIN_KERNEL_ADDRESS);
+}
+
+#define kasan_md_unwind() __nothing
Index: src/sys/arch/evbarm/include/asan.h
diff -u /dev/null src/sys/arch/evbarm/include/asan.h:1.1
--- /dev/null Thu Nov 1 20:34:50 2018
+++ src/sys/arch/evbarm/include/asan.h Thu Nov 1 20:34:50 2018
@@ -0,0 +1,5 @@
+/* $NetBSD: asan.h,v 1.1 2018/11/01 20:34:50 maxv Exp $ */
+
+#ifdef __aarch64__
+#include <aarch64/asan.h>
+#endif
