Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93d16f15 authored by Russell King's avatar Russell King Committed by Amit Pundir
Browse files

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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>

Change-Id: I3064718b9879af018960cda62274891abfaf44a8
(cherry picked from commit 39dc53deff30d9b239ac36cfeb0ef2022d03a449)
Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com>
parent de356751
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -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