Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use common code for SMEP/SMAP panic to print more information and 

allow debugging.
This commit is contained in:
mlelstv 2019-07-13 17:03:01 +00:00
parent 7b3e694533
commit 65e8dbb3e1
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/arch/amd64/amd64/trap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: trap.c,v 1.120 2019/05/15 13:49:10 christos Exp $ */
/* $NetBSD: trap.c,v 1.121 2019/07/13 17:03:01 mlelstv Exp $ */
/*
* Copyright (c) 1998, 2000, 2017 The NetBSD Foundation, Inc.
@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.120 2019/05/15 13:49:10 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.121 2019/07/13 17:03:01 mlelstv Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -481,13 +481,9 @@ trap(struct trapframe *frame)
if (frame->tf_err & PGEX_X) {
/* SMEP might have brought us here */
if (cr2 < VM_MAXUSER_ADDRESS) {
if (cr2 == 0)
panic("prevented jump to null"
" instruction pointer (SMEP)");
else
panic("prevented execution of"
" user address %p (SMEP)",
(void *)cr2);
printf("prevented execution of %p (SMEP)\n",
(void *)cr2);
goto we_re_toast;
}
}
@ -495,8 +491,9 @@ trap(struct trapframe *frame)
cr2 < VM_MAXUSER_ADDRESS) {
/* SMAP might have brought us here */
if (onfault_handler(pcb, frame) == NULL) {
panic("prevented access to %p (SMAP)",
printf("prevented access to %p (SMAP)\n",
(void *)cr2);
goto we_re_toast;
}
}

13
sys/arch/i386/i386/trap.c
View File

@ -1,5 +1,5 @@
/* $NetBSD: trap.c,v 1.301 2019/05/29 14:28:37 msaitoh Exp $ */
/* $NetBSD: trap.c,v 1.302 2019/07/13 17:04:21 mlelstv Exp $ */
/*-
* Copyright (c) 1998, 2000, 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.301 2019/05/29 14:28:37 msaitoh Exp $");
__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.302 2019/07/13 17:04:21 mlelstv Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -582,17 +582,20 @@ kernelfault:
if (frame->tf_err & PGEX_X) {
/* SMEP might have brought us here */
if (cr2 > VM_MIN_ADDRESS && cr2 <= VM_MAXUSER_ADDRESS)
panic("prevented execution of %p (SMEP)",
if (cr2 > VM_MIN_ADDRESS && cr2 <= VM_MAXUSER_ADDRESS) {
printf("prevented execution of %p (SMEP)\n",
(void *)cr2);
goto we_re_toast;
}
}
if ((frame->tf_err & PGEX_P) &&
cr2 < VM_MAXUSER_ADDRESS) {
/* SMAP might have brought us here */
if (onfault_handler(pcb, frame) == NULL) {
panic("prevented access to %p (SMAP)",
printf("prevented access to %p (SMAP)\n",
(void *)cr2);
goto we_re_toast;
}
}