Skip to content

Commit 6c107bb

Browse files
Ravi Bangoriagregkh
authored andcommitted
powerpc/kprobe: Fix oops when kprobed on 'stdu' instruction
commit 9e1ba4f27f018742a1aa95d11e35106feba08ec1 upstream. If we set a kprobe on a 'stdu' instruction on powerpc64, we see a kernel OOPS: Bad kernel stack pointer cd93c840 at c000000000009868 Oops: Bad kernel stack pointer, sig: 6 [#1] ... GPR00: c000001fcd93cb30 00000000cd93c840 c0000000015c5e00 00000000cd93c840 ... NIP [c000000000009868] resume_kernel+0x2c/0x58 LR [c000000000006208] program_check_common+0x108/0x180 On a 64-bit system when the user probes on a 'stdu' instruction, the kernel does not emulate actual store in emulate_step() because it may corrupt the exception frame. So the kernel does the actual store operation in exception return code i.e. resume_kernel(). resume_kernel() loads the saved stack pointer from memory using lwz, which only loads the low 32-bits of the address, causing the kernel crash. Fix this by loading the 64-bit value instead. Fixes: be96f63 ("powerpc: Split out instruction analysis part of emulate_step()") Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com> Reviewed-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> Reviewed-by: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com> [mpe: Change log massage, add stable tag] Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 38be91c commit 6c107bb

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

arch/powerpc/kernel/entry_64.S

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,7 @@ resume_kernel:
716716

717717
addi r8,r1,INT_FRAME_SIZE /* Get the kprobed function entry */
718718

719-
lwz r3,GPR1(r1)
719+
ld r3,GPR1(r1)
720720
subi r3,r3,INT_FRAME_SIZE /* dst: Allocate a trampoline exception frame */
721721
mr r4,r1 /* src: current exception frame */
722722
mr r1,r3 /* Reroute the trampoline frame to r1 */
@@ -730,8 +730,8 @@ resume_kernel:
730730
addi r6,r6,8
731731
bdnz 2b
732732

733-
/* Do real store operation to complete stwu */
734-
lwz r5,GPR1(r1)
733+
/* Do real store operation to complete stdu */
734+
ld r5,GPR1(r1)
735735
std r8,0(r5)
736736

737737
/* Clear _TIF_EMULATE_STACK_STORE flag */

0 commit comments

Comments
 (0)