diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2013-10-01 16:54:05 +1000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-13 14:51:08 -0700 |
| commit | a821af3f7d73022d45550200241e6e671127ec81 (patch) | |
| tree | dfad9bac9ac5fdc89a0dd2396388e6584aa331ce | |
| parent | 46779b3c9f75cb80573a1ceb82b16b831bfb349c (diff) | |
| download | linux-stable-a821af3f7d73022d45550200241e6e671127ec81.tar.gz linux-stable-a821af3f7d73022d45550200241e6e671127ec81.tar.bz2 linux-stable-a821af3f7d73022d45550200241e6e671127ec81.zip | |
powerpc: Fix parameter clobber in csum_partial_copy_generic()
commit d9813c3681a36774b254c0cdc9cce53c9e22c756 upstream.
The csum_partial_copy_generic() uses register r7 to adjust the remaining
bytes to process. Unfortunately, r7 also holds a parameter, namely the
address of the flag to set in case of access exceptions while reading
the source buffer. Lacking a quantum implementation of PowerPC, this
commit instead uses register r9 to do the adjusting, leaving r7's
pointer uncorrupted.
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/powerpc/lib/checksum_64.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/lib/checksum_64.S b/arch/powerpc/lib/checksum_64.S index 18245af38aea..afa2ebaee174 100644 --- a/arch/powerpc/lib/checksum_64.S +++ b/arch/powerpc/lib/checksum_64.S @@ -272,8 +272,8 @@ _GLOBAL(csum_partial_copy_generic) rldicl. r6,r3,64-1,64-2 /* r6 = (r3 & 0x3) >> 1 */ beq .Lcopy_aligned - li r7,4 - sub r6,r7,r6 + li r9,4 + sub r6,r9,r6 mtctr r6 1: |