diff options
| author | Linus Torvalds | 2017-12-20 16:47:14 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2017-12-20 16:47:14 -0800 |
| commit | 877631f360fa83bb1fe4e0e8895e88f4d02b29e3 (patch) | |
| tree | 95bcc74c6cb199a63d81e731e9870e39eba39701 /arch | |
| parent | 1362d628cbce244e0b90c60d6d631289d07bbfa1 (diff) | |
| parent | 36b0cb84ee858f02c256d26f0cb4229c78e3399e (diff) | |
Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM fix from Russell King:
"Just one fix for a problem in the csum_partial_copy_from_user()
implementation when software PAN is enabled"
* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
ARM: 8731/1: Fix csum_partial_copy_from_user() stack mismatch
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/lib/csumpartialcopyuser.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S index 1712f132b80d..b83fdc06286a 100644 --- 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 |