projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a5e090a)
ARM: swpan: fix nwfpe for uaccess changes
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 6 Sep 2015 23:29:15 +0000 (00:29 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 9 Sep 2015 22:26:11 +0000 (23:26 +0100)
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>
arch/arm/nwfpe/entry.S patch | blob | blame | history

diff --git a/arch/arm/nwfpe/entry.S b/arch/arm/nwfpe/entry.S
index 71df4354765927da922606db930c6665cbd0c7f9..39c20afad7ed9ed3b4b967a54d3a435e07eccf9e 100644 (file)
--- 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