diff options
| author | andrew <andrew@FreeBSD.org> | 2016-03-22 08:36:25 +0000 |
|---|---|---|
| committer | andrew <andrew@FreeBSD.org> | 2016-03-22 08:36:25 +0000 |
| commit | acaab8fb107cfe1d09dafbf09733594df2459be1 (patch) | |
| tree | 1952124e6562cad1e24909badb541ced601509d4 /sys/arm64 | |
| parent | aff96eae8427a86b332532c7ef8be9620d754d5f (diff) | |
| download | FreeBSD-src-acaab8fb107cfe1d09dafbf09733594df2459be1.zip FreeBSD-src-acaab8fb107cfe1d09dafbf09733594df2459be1.tar.gz | |
Use the saved program state register to detect when an exception frame is
from userpsace. Previously we could have triggered a panic by trying to
jump to a kernel address from userland as the trap handling code thought we
received an ast in kernel mode.
Obtained from: ABT Systems Ltd
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys/arm64')
| -rw-r--r-- | sys/arm64/include/cpu.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arm64/include/cpu.h b/sys/arm64/include/cpu.h index 8f14e82..520729c 100644 --- a/sys/arm64/include/cpu.h +++ b/sys/arm64/include/cpu.h @@ -1,6 +1,6 @@ /*- * Copyright (c) 1990 The Regents of the University of California. - * Copyright (c) 2014 The FreeBSD Foundation + * Copyright (c) 2014-2016 The FreeBSD Foundation * All rights reserved. * * This code is derived from software contributed to Berkeley by @@ -46,7 +46,7 @@ #include <machine/armreg.h> #define TRAPF_PC(tfp) ((tfp)->tf_lr) -#define TRAPF_USERMODE(tfp) (((tfp)->tf_elr & (1ul << 63)) == 0) +#define TRAPF_USERMODE(tfp) (((tfp)->tf_spsr & PSR_M_MASK) == PSR_M_EL0t) #define cpu_getstack(td) ((td)->td_frame->tf_sp) #define cpu_setstack(td, sp) ((td)->td_frame->tf_sp = (sp)) |
