diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-26 12:18:16 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-26 12:18:16 +0100 |
| commit | 4609a179c97ae60fef173547a9bbb214359808ce (patch) | |
| tree | a36f01e2e29446da9a90cd6f4d416ff9c790091a /arch/arm/lib | |
| parent | ARM: 6265/1: kirkwood: move qnap_tsx1x_register_flash() to .init.text (diff) | |
| download | linux-dev-4609a179c97ae60fef173547a9bbb214359808ce.tar.xz linux-dev-4609a179c97ae60fef173547a9bbb214359808ce.zip | |
ARM: Fix csum_partial_copy_from_user()
Using the parent functions frame pointer to access our arguments is
completely wrong, whether or not we're building with frame pointers
or not. What we should be using is the stack pointer to get at the
word above the registers we stacked ourselves.
Reported-by: Bosko Radivojevic <bosko.radivojevic@gmail.com>
Tested-by: Bosko Radivojevic <bosko.radivojevic@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/csumpartialcopyuser.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S index 59ff6fdc1e63..7d08b43d2c0e 100644 --- a/arch/arm/lib/csumpartialcopyuser.S +++ b/arch/arm/lib/csumpartialcopyuser.S @@ -71,7 +71,7 @@ .pushsection .fixup,"ax" .align 4 9001: mov r4, #-EFAULT - ldr r5, [fp, #4] @ *err_ptr + ldr r5, [sp, #8*4] @ *err_ptr str r4, [r5] ldmia sp, {r1, r2} @ retrieve dst, len add r2, r2, r1 |