]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
parisc: Fix kernel crash with reversed copy_from_user()
authorHelge Deller <deller@gmx.de>
Fri, 8 Apr 2016 16:18:48 +0000 (18:18 +0200)
committerHelge Deller <deller@gmx.de>
Fri, 8 Apr 2016 20:14:04 +0000 (22:14 +0200)
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>
arch/parisc/kernel/traps.c

index 16e0735e2f46bebb2b3a806d4b9d7d2f1a01c786..97d6b208e1294d23f52d825ee14ca28694f7876e 100644 (file)
@@ -795,6 +795,9 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
 
            if (fault_space == 0 && !faulthandler_disabled())
            {
+               /* 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);
            }