2 files changed, 15 insertions, 1 deletions

diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
index bd8601601afa..5b836f5aea90 100644
--- a/arch/sparc/mm/fault_32.c
+++ b/arch/sparc/mm/fault_32.c
@@ -539,6 +539,12 @@ do_sigbus:
         __do_fault_siginfo(BUS_ADRERR, SIGBUS, tsk->thread.kregs, address);
 }
 
+static void check_stack_aligned(unsigned long sp)
+{
+        if (sp & 0x7UL)
+                force_sig(SIGILL, current);
+}
+
 void window_overflow_fault(void)
 {
         unsigned long sp;
@@ -547,6 +553,8 @@ void window_overflow_fault(void)
         if(((sp + 0x38) & PAGE_MASK) != (sp & PAGE_MASK))
                 force_user_fault(sp + 0x38, 1);
         force_user_fault(sp, 1);
+
+        check_stack_aligned(sp);
 }
 
 void window_underflow_fault(unsigned long sp)
@@ -554,6 +562,8 @@ void window_underflow_fault(unsigned long sp)
         if(((sp + 0x38) & PAGE_MASK) != (sp & PAGE_MASK))
                 force_user_fault(sp + 0x38, 0);
         force_user_fault(sp, 0);
+
+        check_stack_aligned(sp);
 }
 
 void window_ret_fault(struct pt_regs *regs)
@@ -564,4 +574,6 @@ void window_ret_fault(struct pt_regs *regs)
         if(((sp + 0x38) & PAGE_MASK) != (sp & PAGE_MASK))
                 force_user_fault(sp + 0x38, 0);
         force_user_fault(sp, 0);
+
+        check_stack_aligned(sp);
 }
diff --git a/arch/sparc/mm/highmem.c b/arch/sparc/mm/highmem.c
index 5e50c09b7dce..4730eac0747b 100644
--- a/arch/sparc/mm/highmem.c
+++ b/arch/sparc/mm/highmem.c
@@ -75,7 +75,7 @@ void __kunmap_atomic(void *kvaddr)
                 return;
         }
 
-        type = kmap_atomic_idx_pop();
+        type = kmap_atomic_idx();
 
 #ifdef CONFIG_DEBUG_HIGHMEM
         {
@@ -104,6 +104,8 @@ void __kunmap_atomic(void *kvaddr)
 #endif
         }
 #endif
+
+        kmap_atomic_idx_pop();
         pagefault_enable();
 }
 EXPORT_SYMBOL(__kunmap_atomic);