From fbd3af3600f086ac1908f8aaffa647923abee0c2 Mon Sep 17 00:00:00 2001
From: Jeff Dike <jdike@addtoit.com>
Date: Fri, 6 May 2005 21:30:55 -0700
Subject: [PATCH] --- yaml --- r: 1085 b: refs/heads/master c:
 2d58cc9a437f3833d242e9d1617ec9b4044e26f3 h: refs/heads/master i:   1083:
 fc58187c6d7a5a2a5ce074da44a12159740d11c0 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/um/kernel/skas/uaccess.c | 7 +++++--
 trunk/arch/um/kernel/syscall_kern.c | 1 -
 trunk/arch/um/kernel/trap_kern.c    | 2 +-
 trunk/arch/um/sys-x86_64/signal.c   | 2 +-
 trunk/arch/um/sys-x86_64/syscalls.c | 2 ++
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 29c7426a3a4d..9178b1776ed9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f7e663dea7f0e22f3b2d07156c5e9d2e8656610
+refs/heads/master: 2d58cc9a437f3833d242e9d1617ec9b4044e26f3
diff --git a/trunk/arch/um/kernel/skas/uaccess.c b/trunk/arch/um/kernel/skas/uaccess.c
index f7da9d027672..75195281081e 100644
--- a/trunk/arch/um/kernel/skas/uaccess.c
+++ b/trunk/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/trunk/arch/um/kernel/syscall_kern.c b/trunk/arch/um/kernel/syscall_kern.c
index 42731e04f50f..b7a55251e897 100644
--- a/trunk/arch/um/kernel/syscall_kern.c
+++ b/trunk/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/trunk/arch/um/kernel/trap_kern.c b/trunk/arch/um/kernel/trap_kern.c
index 54e2ec33a43c..5fca2c61eb98 100644
--- a/trunk/arch/um/kernel/trap_kern.c
+++ b/trunk/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;
diff --git a/trunk/arch/um/sys-x86_64/signal.c b/trunk/arch/um/sys-x86_64/signal.c
index b740177066a0..73a7926f7370 100644
--- a/trunk/arch/um/sys-x86_64/signal.c
+++ b/trunk/arch/um/sys-x86_64/signal.c
@@ -168,7 +168,7 @@ int setup_signal_stack_si(unsigned long stack_top, int sig,
 
 	frame = (struct rt_sigframe __user *)
 		round_down(stack_top - sizeof(struct rt_sigframe), 16) - 8;
-	frame -= 128;
+	((unsigned char *) frame) -= 128;
 
 	if (!access_ok(VERIFY_WRITE, fp, sizeof(struct _fpstate)))
 		goto out;
diff --git a/trunk/arch/um/sys-x86_64/syscalls.c b/trunk/arch/um/sys-x86_64/syscalls.c
index 2a575ef52bba..dd9914642b8e 100644
--- a/trunk/arch/um/sys-x86_64/syscalls.c
+++ b/trunk/arch/um/sys-x86_64/syscalls.c
@@ -44,6 +44,8 @@ long sys_modify_ldt_tt(int func, void *ptr, unsigned long bytecount)
 #ifdef CONFIG_MODE_SKAS
 extern int userspace_pid[];
 
+#include "skas_ptrace.h"
+
 long sys_modify_ldt_skas(int func, void *ptr, unsigned long bytecount)
 {
 	struct ptrace_ldt ldt;