diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-08-21 09:30:16 +0100 |
|---|---|---|
| committer | Jeff Vander Stoep <jeffv@google.com> | 2016-01-25 09:26:00 -0800 |
| commit | b2cfef831e74fe04838e29c6d254b6d99a3dc614 (patch) | |
| tree | 13aafb509132e5ef2f3e53237973678057a3ea54 | |
| parent | ab4e6d754114b8bfe3e26766b3eeb226fd951b69 (diff) | |
| download | hikey-linaro-b2cfef831e74fe04838e29c6d254b6d99a3dc614.tar.gz | |
UPSTREAM: ARM: domains: get rid of manager mode for user domain
Since we switched to early trap initialisation in 94e5a85b3be0
("ARM: earlier initialization of vectors page") we haven't been writing
directly to the vectors page, and so there's no need for this domain
to be in manager mode. Switch it to client mode.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Bug: 25672827
Patchset: PAN emulation
(cherry picked from commit 3c2aed5b28819564e1a07b4686bd89802bcc4d6b)
Signed-off-by: Kees Cook <keescook@google.com>
Change-Id: I6a31f15cd3cc8d431ee50fcc041e95becf2ed7df
| -rw-r--r-- | arch/arm/include/asm/domain.h | 2 | ||||
| -rw-r--r-- | arch/arm/kernel/traps.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h index 4218f88e8f7e..08b601e69ddc 100644 --- a/arch/arm/include/asm/domain.h +++ b/arch/arm/include/asm/domain.h @@ -59,7 +59,7 @@ #define domain_val(dom,type) ((type) << (2 * (dom))) #define DACR_INIT \ - (domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \ + (domain_val(DOMAIN_USER, DOMAIN_CLIENT) | \ domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \ domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \ domain_val(DOMAIN_IO, DOMAIN_CLIENT)) diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 3dce1a342030..4837003aad6a 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c @@ -878,7 +878,6 @@ void __init early_trap_init(void *vectors_base) kuser_init(vectors_base); flush_icache_range(vectors, vectors + PAGE_SIZE * 2); - modify_domain(DOMAIN_USER, DOMAIN_CLIENT); #else /* ifndef CONFIG_CPU_V7M */ /* * on V7-M there is no need to copy the vector table to a dedicated |