diff options
| author | Helge Deller <deller@gmx.de> | 2016-04-08 18:18:48 +0200 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-04-20 01:08:54 -0400 |
| commit | 9ccccafe228ec2a71a6df4268ce95c27e3d3c8cf (patch) | |
| tree | 5b8777e6a46eb1755cd68d2ccfc6785db805bfaa /arch/parisc | |
| parent | 073cac90966d106bd0959dd44170ab73482f7ef5 (diff) | |
parisc: Fix kernel crash with reversed copy_from_user()
[ Upstream commit ef72f3110d8b19f4c098a0bff7ed7d11945e70c6 ]
The kernel module testcase (lib/test_user_copy.c) exhibited a kernel
crash on parisc if the parameters for copy_from_user were reversed
("illegal reversed copy_to_user" testcase).
Fix this potential crash by checking the fault handler if the faulting
address is in the exception table.
Signed-off-by: Helge Deller <deller@gmx.de>
Cc: stable@vger.kernel.org
Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'arch/parisc')
| -rw-r--r-- | arch/parisc/kernel/traps.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c index 7f67c4c96a7a..bbf22658d1a3 100644 --- a/arch/parisc/kernel/traps.c +++ b/arch/parisc/kernel/traps.c @@ -798,6 +798,9 @@ void notrace handle_interruption(int code, struct pt_regs *regs) if (fault_space == 0 && !in_atomic()) { + /* Clean up and return if in exception table. */ + if (fixup_exception(regs)) + return; pdc_chassis_send_status(PDC_CHASSIS_DIRECT_PANIC); parisc_terminate("Kernel Fault", regs, code, fault_address); } |