Skip to content

Commit ae952ee

Browse files
committed
s390/entry: Fix last breaking event handling in case of stack corruption
In case of stack corruption stack_invalid() is called and the expectation is that register r10 contains the last breaking event address. This dependency is quite subtle and broke a couple of years ago without that anybody noticed. Fix this by getting rid of the dependency and read the last breaking event address from lowcore. Fixes: 56e62a7 ("s390: convert to generic entry") Acked-by: Ilya Leoshkevich <iii@linux.ibm.com> Reviewed-by: Alexander Gordeev <agordeev@linux.ibm.com> Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
1 parent d2b8111 commit ae952ee

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

arch/s390/kernel/entry.S

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,8 @@ SYM_CODE_START(stack_invalid)
602602
stmg %r0,%r7,__PT_R0(%r11)
603603
stmg %r8,%r9,__PT_PSW(%r11)
604604
mvc __PT_R8(64,%r11),0(%r14)
605-
stg %r10,__PT_ORIG_GPR2(%r11) # store last break to orig_gpr2
605+
GET_LC %r2
606+
mvc __PT_ORIG_GPR2(8,%r11),__LC_PGM_LAST_BREAK(%r2)
606607
xc __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
607608
lgr %r2,%r11 # pass pointer to pt_regs
608609
jg kernel_stack_invalid

0 commit comments

Comments
 (0)