diff options
| author | Helge Deller <deller@gmx.de> | 2016-04-08 19:18:48 +0300 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-04-20 16:40:58 +0300 |
| commit | 2680e055d991165d289149bd090a0ddf24bd88cb (patch) | |
| tree | 454288e390f739eed6d9f04cc1796b807e1f6bcb /arch/parisc | |
| parent | 7d96d5947bb6a5704e15789140bcd572cdb14d6d (diff) | |
| download | linux-2680e055d991165d289149bd090a0ddf24bd88cb.tar.xz | |
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 47ee620d15d2..05aab1333dfa 100644 --- a/arch/parisc/kernel/traps.c +++ b/arch/parisc/kernel/traps.c @@ -802,6 +802,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); } |