projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
ARM: 8731/1: Fix csum_partial_copy_from_user() stack mismatch
[linux-2.6-block.git]
/
arch
/
arm
/
lib
/
csumpartialcopyuser.S
diff --git
a/arch/arm/lib/csumpartialcopyuser.S
b/arch/arm/lib/csumpartialcopyuser.S
index 1712f132b80d2402d94d72ea974a0c3326fa2f52..b83fdc06286a64ece150fb7e419bc587e47c3e34 100644
(file)
--- a/
arch/arm/lib/csumpartialcopyuser.S
+++ b/
arch/arm/lib/csumpartialcopyuser.S
@@
-85,7
+85,11
@@
.pushsection .text.fixup,"ax"
.align 4
9001: mov r4, #-EFAULT
+#ifdef CONFIG_CPU_SW_DOMAIN_PAN
+ ldr r5, [sp, #9*4] @ *err_ptr
+#else
ldr r5, [sp, #8*4] @ *err_ptr
+#endif
str r4, [r5]
ldmia sp, {r1, r2} @ retrieve dst, len
add r2, r2, r1