1 files changed, 9 insertions, 1 deletions

diff --git a/arch/parisc/kernel/unaligned.c b/arch/parisc/kernel/unaligned.c
index d7c0acb35ec2..8d49614d600d 100644
--- a/arch/parisc/kernel/unaligned.c
+++ b/arch/parisc/kernel/unaligned.c
@@ -666,7 +666,7 @@ void handle_unaligned(struct pt_regs *regs)
                 break;
         }
 
-        if (modify && R1(regs->iir))
+        if (ret == 0 && modify && R1(regs->iir))
                 regs->gr[R1(regs->iir)] = newbase;
 
 
@@ -677,6 +677,14 @@ void handle_unaligned(struct pt_regs *regs)
 
         if (ret)
         {
+                /*
+                 * The unaligned handler failed.
+                 * If we were called by __get_user() or __put_user() jump
+                 * to it's exception fixup handler instead of crashing.
+                 */
+                if (!user_mode(regs) && fixup_exception(regs))
+                        return;
+
                 printk(KERN_CRIT "Unaligned handler failed, ret = %d\n", ret);
                 die_if_kernel("Unaligned data reference", regs, 28);