diff options
author | Helge Deller <deller@gmx.de> | 2016-04-08 12:18:48 -0400 |
---|---|---|
committer | Helge Deller <deller@gmx.de> | 2016-04-08 16:14:04 -0400 |
commit | ef72f3110d8b19f4c098a0bff7ed7d11945e70c6 (patch) | |
tree | 42b3f7f407b9d875baaf36045f59fc0965d675ee | |
parent | e3893027a300927049efc1572f852201eb785142 (diff) |
parisc: Fix kernel crash with reversed copy_from_user()
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>
-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 16e0735e2f46..97d6b208e129 100644 --- a/arch/parisc/kernel/traps.c +++ b/arch/parisc/kernel/traps.c | |||
@@ -795,6 +795,9 @@ void notrace handle_interruption(int code, struct pt_regs *regs) | |||
795 | 795 | ||
796 | if (fault_space == 0 && !faulthandler_disabled()) | 796 | if (fault_space == 0 && !faulthandler_disabled()) |
797 | { | 797 | { |
798 | /* Clean up and return if in exception table. */ | ||
799 | if (fixup_exception(regs)) | ||
800 | return; | ||
798 | pdc_chassis_send_status(PDC_CHASSIS_DIRECT_PANIC); | 801 | pdc_chassis_send_status(PDC_CHASSIS_DIRECT_PANIC); |
799 | parisc_terminate("Kernel Fault", regs, code, fault_address); | 802 | parisc_terminate("Kernel Fault", regs, code, fault_address); |
800 | } | 803 | } |