3 files changed, 6 insertions, 4 deletions

diff --git a/arch/um/kernel/skas/uaccess.c b/arch/um/kernel/skas/uaccess.c
index f7da9d027672..75195281081e 100644
--- a/arch/um/kernel/skas/uaccess.c
+++ b/arch/um/kernel/skas/uaccess.c
@@ -29,9 +29,12 @@ static unsigned long maybe_map(unsigned long virt, int is_write)
         if(IS_ERR(phys) || (is_write && !pte_write(pte))){
                 err = handle_page_fault(virt, 0, is_write, 1, &dummy_code);
                 if(err)
-                        return(0);
+                        return(-1UL);
                 phys = um_virt_to_phys(current, virt, NULL);
         }
+        if(IS_ERR(phys))
+                phys = (void *) -1;
+
         return((unsigned long) phys);
 }
 
@@ -42,7 +45,7 @@ static int do_op(unsigned long addr, int len, int is_write,
         int n;
 
         addr = maybe_map(addr, is_write);
-        if(addr == -1)
+        if(addr == -1UL)
                 return(-1);
 
         page = phys_to_page(addr);
diff --git a/arch/um/kernel/syscall_kern.c b/arch/um/kernel/syscall_kern.c
index 42731e04f50f..b7a55251e897 100644
--- a/arch/um/kernel/syscall_kern.c
+++ b/arch/um/kernel/syscall_kern.c
@@ -17,7 +17,6 @@
 #include "linux/utime.h"
 #include "asm/mman.h"
 #include "asm/uaccess.h"
-#include "asm/ipc.h"
 #include "kern_util.h"
 #include "user_util.h"
 #include "sysdep/syscalls.h"
diff --git a/arch/um/kernel/trap_kern.c b/arch/um/kernel/trap_kern.c
index 54e2ec33a43c..5fca2c61eb98 100644
--- a/arch/um/kernel/trap_kern.c
+++ b/arch/um/kernel/trap_kern.c
@@ -48,7 +48,7 @@ int handle_page_fault(unsigned long address, unsigned long ip,
                 goto good_area;
         else if(!(vma->vm_flags & VM_GROWSDOWN)) 
                 goto out;
-        else if(!ARCH_IS_STACKGROW(address))
+        else if(is_user && !ARCH_IS_STACKGROW(address))
                 goto out;
         else if(expand_stack(vma, address)) 
                 goto out;