TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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: Adrian Bunk <bunk@stusta.de>
This commit is contained in:
Benjamin Herrenschmidt
2006-11-20 22:45:49 +01:00
committed by Adrian Bunk
parent 70c505610f
commit 371899a77a
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/powerpc/kernel/traps.c
+10 -8
View File
@@ -837,7 +837,7 @@ void __kprobes program_check_exception(struct pt_regs *regs)
void alignment_exception(struct pt_regs *regs)
{
int fixed;
int sig, code, fixed;
fixed = fix_alignment(regs);
@@ -849,14 +849,16 @@ void alignment_exception(struct pt_regs *regs)
/* Operand address was bad */
if (fixed == -EFAULT) {
if (user_mode(regs))
_exception(SIGSEGV, regs, SEGV_ACCERR, regs->dar);
else
/* Search exception table */
bad_page_fault(regs, regs->dar, SIGSEGV);
return;
sig = SIGSEGV;
code = SEGV_ACCERR;
} else {
sig = SIGBUS;
code = BUS_ADRALN;
}
_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)
arch/ppc/kernel/traps.c
+10 -8
View File
@@ -711,7 +711,7 @@ void single_step_exception(struct pt_regs *regs)
void alignment_exception(struct pt_regs *regs)
{
int fixed;
int sig, code, fixed = 0;
fixed = fix_alignment(regs);
if (fixed == 1) {
@@ -720,14 +720,16 @@ void alignment_exception(struct pt_regs *regs)
return;
}
if (fixed == -EFAULT) {
/* fixed == -EFAULT means the operand address was bad */
if (user_mode(regs))
_exception(SIGSEGV, regs, SEGV_ACCERR, regs->dar);
else
bad_page_fault(regs, regs->dar, SIGSEGV);
return;
sig = SIGSEGV;
code = SEGV_ACCERR;
} else {
sig = SIGBUS;
code = BUS_ADRALN;
}
_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)