CVS commit: src/sys/arch/aarch64/aarch64

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Fri Dec 13 08:11:12 UTC 2019

Modified Files:
        src/sys/arch/aarch64/aarch64: pmap.c

Log Message:
Fix KASAN support by calling kasan_shadow_map in pmap_growkernel


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/aarch64/aarch64/pmap.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/arch/aarch64/aarch64/pmap.c
diff -u src/sys/arch/aarch64/aarch64/pmap.c:1.51 src/sys/arch/aarch64/aarch64/pmap.c:1.52
--- src/sys/arch/aarch64/aarch64/pmap.c:1.51	Tue Dec 10 18:08:32 2019
+++ src/sys/arch/aarch64/aarch64/pmap.c	Fri Dec 13 08:11:12 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.51 2019/12/10 18:08:32 ad Exp $	*/
+/*	$NetBSD: pmap.c,v 1.52 2019/12/13 08:11:12 skrll Exp $	*/
 
 /*
  * Copyright (c) 2017 Ryo Shimizu <r...@nerv.org>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.51 2019/12/10 18:08:32 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.52 2019/12/13 08:11:12 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_ddb.h"
@@ -699,6 +699,9 @@ pmap_growkernel(vaddr_t maxkvaddr)
 	UVMHIST_LOG(pmaphist, "maxkvaddr=%llx, pmap_maxkvaddr=%llx",
 	    maxkvaddr, pmap_maxkvaddr, 0, 0);
 
+        kasan_shadow_map((void *)pmap_maxkvaddr,
+          (size_t)(maxkvaddr - pmap_maxkvaddr));
+
 	pmap_maxkvaddr = maxkvaddr;
 
 	return maxkvaddr;