2004-11-12 23:58:28

by Jeff Dike

[permalink] [raw]
Subject: [PATCH 3/11] - UML - don't rule out syscall_nr == 0

>From Bodo Stroesser - Change the valid system call numbers to reflect the
possibility that we could have __NR_restart_syscall.

Signed-off-by: Jeff Dike <[email protected]>

Index: 2.6.9/arch/um/kernel/skas/process.c
===================================================================
--- 2.6.9.orig/arch/um/kernel/skas/process.c 2004-11-12 13:24:54.000000000 -0500
+++ 2.6.9/arch/um/kernel/skas/process.c 2004-11-12 13:34:34.000000000 -0500
@@ -64,7 +64,7 @@

syscall_nr = PT_SYSCALL_NR(regs->skas.regs);
UPT_SYSCALL_NR(regs) = syscall_nr;
- if(syscall_nr < 1){
+ if(syscall_nr < 0){
relay_signal(SIGTRAP, regs);
return;
}
Index: 2.6.9/arch/um/kernel/tt/syscall_user.c
===================================================================
--- 2.6.9.orig/arch/um/kernel/tt/syscall_user.c 2004-11-12 13:24:54.000000000 -0500
+++ 2.6.9/arch/um/kernel/tt/syscall_user.c 2004-11-12 18:05:29.000000000 -0500
@@ -63,7 +63,8 @@
regs = TASK_REGS(task);
UPT_SYSCALL_NR(regs) = syscall;

- if(syscall < 1) return(0);
+ if(syscall < 0)
+ return(0);

if((syscall != __NR_sigreturn) &&
((unsigned long *) PT_IP(proc_regs) >= &_stext) &&