Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

powerpc: Fix bad stack check in exception entry

In EXCEPTION_PROLOG_COMMON() we check to see if the stack pointer (r1)
is valid when coming from the kernel. If it's not valid, we die but
with a nice oops message.

Currently we allocate a stack frame (subtract INT_FRAME_SIZE) before we
check to see if the stack pointer is negative. Unfortunately, this
won't detect a bad stack where r1 is less than INT_FRAME_SIZE.

This patch fixes the check to compare the modified r1 with
-INT_FRAME_SIZE. With this, bad kernel stack pointers (including NULL
pointers) are correctly detected again.

Kudos to Paulus for finding this.

Signed-off-by: Michael Neuling <mikey@neuling.org>
cc: stable@vger.kernel.org
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

authored by

Michael Neuling and committed by
Benjamin Herrenschmidt
90ff5d68 803c2d2f

+1 -1
+1 -1
arch/powerpc/include/asm/exception-64s.h
··· 284 284 subi r1,r1,INT_FRAME_SIZE; /* alloc frame on kernel stack */ \ 285 285 beq- 1f; \ 286 286 ld r1,PACAKSAVE(r13); /* kernel stack to use */ \ 287 - 1: cmpdi cr1,r1,0; /* check if r1 is in userspace */ \ 287 + 1: cmpdi cr1,r1,-INT_FRAME_SIZE; /* check if r1 is in userspace */ \ 288 288 blt+ cr1,3f; /* abort if it is */ \ 289 289 li r1,(n); /* will be reloaded later */ \ 290 290 sth r1,PACA_TRAP_SAVE(r13); \