]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
powerpc32: don't adjust unmoved stack pointer in csum_partial_copy_generic() epilogue
authorJason A. Donenfeld <Jason@zx2c4.com>
Wed, 14 Oct 2020 23:02:09 +0000 (01:02 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Oct 2020 23:04:13 +0000 (16:04 -0700)
A recent change to the checksum code removed usage of some extra
arguments, alongside with storage on the stack for those, and the stack
pointer no longer needed to be adjusted in the function prologue.

But a left over subtraction wasn't removed in the function epilogue,
causing the function to return with the stack pointer moved 16 bytes
away from where it should have.  This corrupted local state and lead to
weird crashes.

This simply removes the leftover instruction from the epilogue.

Fixes: 70d65cd555c5 ("ppc: propagate the calling conventions change down to csum_partial_copy_generic()")
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/powerpc/lib/checksum_32.S

index ec5cd2dede352ada14b1d22d9d289e8a9d22c342..27d9070617dfb11f19c5342bed4763996bf4a400 100644 (file)
@@ -236,7 +236,6 @@ _GLOBAL(csum_partial_copy_generic)
        slwi    r0,r0,8
        adde    r12,r12,r0
 66:    addze   r3,r12
-       addi    r1,r1,16
        beqlr+  cr7
        rlwinm  r3,r3,8,0,31    /* odd destination address: rotate one byte */
        blr