GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-27 09:02:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[POWERPC] Make alignment exception always check exception table

Browse source 
The alignment exception used to only check the exception table for
-EFAULT, not for other errors. That opens an oops window if we can
coerce the kernel into getting an alignment exception for other reasons
in what would normally be a user-protected accessor, which can be done
via some of the futex ops. This fixes it by always checking the
exception tables.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Benjamin Herrenschmidt 2006-11-01 15:11:39 +11:00 • committed by Paul Mackerras
parent 0d69a052d4
commit 4393c4f678
2 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
arch/powerpc/kernel/traps.c
View file

@ -843,7 +843,7 @@ void __kprobes program_check_exception(struct pt_regs *regs)
void alignment_exception(struct pt_regs *regs) void alignment_exception(struct pt_regs *regs)
{ {
int fixed = 0; int sig, code, fixed = 0;
/* we don't implement logging of alignment exceptions */ /* we don't implement logging of alignment exceptions */
if (!(current->thread.align_ctl & PR_UNALIGN_SIGBUS)) if (!(current->thread.align_ctl & PR_UNALIGN_SIGBUS))
@ -857,14 +857,16 @@ void alignment_exception(struct pt_regs *regs)
/* Operand address was bad */ /* Operand address was bad */
if (fixed == -EFAULT) { if (fixed == -EFAULT) {
if (user_mode(regs)) sig = SIGSEGV;
_exception(SIGSEGV, regs, SEGV_ACCERR, regs->dar); code = SEGV_ACCERR;
else } else {
/* Search exception table */ sig = SIGBUS;
bad_page_fault(regs, regs->dar, SIGSEGV); code = BUS_ADRALN;
return;
} }
_exception(SIGBUS, regs, BUS_ADRALN, regs->dar); if (user_mode(regs))
_exception(sig, regs, code, regs->dar);
else
bad_page_fault(regs, regs->dar, sig);
} }
void StackOverflow(struct pt_regs *regs) void StackOverflow(struct pt_regs *regs)

18
arch/ppc/kernel/traps.c
View file

@ -708,7 +708,7 @@ void single_step_exception(struct pt_regs *regs)
void alignment_exception(struct pt_regs *regs) void alignment_exception(struct pt_regs *regs)
{ {
int fixed; int sig, code, fixed = 0;
fixed = fix_alignment(regs); fixed = fix_alignment(regs);
if (fixed == 1) { if (fixed == 1) {
@ -717,14 +717,16 @@ void alignment_exception(struct pt_regs *regs)
return; return;
} }
if (fixed == -EFAULT) { if (fixed == -EFAULT) {
/* fixed == -EFAULT means the operand address was bad */ sig = SIGSEGV;
if (user_mode(regs)) code = SEGV_ACCERR;
_exception(SIGSEGV, regs, SEGV_ACCERR, regs->dar); } else {
else sig = SIGBUS;
bad_page_fault(regs, regs->dar, SIGSEGV); code = BUS_ADRALN;
return;
} }
_exception(SIGBUS, regs, BUS_ADRALN, regs->dar); if (user_mode(regs))
_exception(sig, regs, code, regs->dar);
else
bad_page_fault(regs, regs->dar, sig);
} }
void StackOverflow(struct pt_regs *regs) void StackOverflow(struct pt_regs *regs)