diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-09-07 00:29:15 +0100 |
|---|---|---|
| committer | Jeff Vander Stoep <jeffv@google.com> | 2016-01-25 09:26:38 -0800 |
| commit | 6cc9b9815f2f100499f7934aca1a214fedc7de68 (patch) | |
| tree | 21a0c4ba5d17f5065c270dd272a9642d92212a75 | |
| parent | 7d8fb5cf801ae6f92dca85bb32cfe29a707faece (diff) | |
| download | hikey-linaro-6cc9b9815f2f100499f7934aca1a214fedc7de68.tar.gz | |
UPSTREAM: ARM: swpan: fix nwfpe for uaccess changes
NWFPE needs to access userspace to check whether the next instruction
is another FP instruction. Allow userspace access for this read.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Bug: 25672827
Patchset: PAN emulation
(cherry picked from commit 39dc53deff30d9b239ac36cfeb0ef2022d03a449)
Signed-off-by: Kees Cook <keescook@google.com>
Change-Id: Ia9a0fd707d14f8a8f4b181a210a8e27fabd9060d
| -rw-r--r-- | arch/arm/nwfpe/entry.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/nwfpe/entry.S b/arch/arm/nwfpe/entry.S index 71df43547659..39c20afad7ed 100644 --- a/arch/arm/nwfpe/entry.S +++ b/arch/arm/nwfpe/entry.S @@ -95,9 +95,10 @@ emulate: reteq r4 @ no, return failure next: + uaccess_enable r3 .Lx1: ldrt r6, [r5], #4 @ get the next instruction and @ increment PC - + uaccess_disable r3 and r2, r6, #0x0F000000 @ test for FP insns teq r2, #0x0C000000 teqne r2, #0x0D000000 |