aboutsummaryrefslogtreecommitdiff
path: root/arch/um/kernel/skas/syscall.c
diff options
context:
space:
mode:
authorRichard Weinberger <richard@nod.at>2015-10-25 19:54:33 +0100
committerRichard Weinberger <richard@nod.at>2015-11-06 22:49:09 +0100
commit1d80f0cda10118d7505bd0a09a5c1c72f3a5f6c8 (patch)
treeaf1013ab500f852040bfe4ac4f579584e54650ac /arch/um/kernel/skas/syscall.c
parent44011b897adf4be7a5bd7f2baf2ffec9cd87ec74 (diff)
downloadlinux-linaro-stable-1d80f0cda10118d7505bd0a09a5c1c72f3a5f6c8.tar.gz
um: Store syscall number after syscall_trace_enter()
To support changing syscall numbers we have to store it after syscall_trace_enter(). Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/kernel/skas/syscall.c')
-rw-r--r--arch/um/kernel/skas/syscall.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/arch/um/kernel/skas/syscall.c b/arch/um/kernel/skas/syscall.c
index d9ec0068b623..64a8fe589d6f 100644
--- a/arch/um/kernel/skas/syscall.c
+++ b/arch/um/kernel/skas/syscall.c
@@ -8,6 +8,7 @@
#include <kern_util.h>
#include <sysdep/ptrace.h>
#include <sysdep/syscalls.h>
+#include <os.h>
extern int syscall_table_size;
#define NR_SYSCALLS (syscall_table_size / sizeof(void *))
@@ -23,16 +24,8 @@ void handle_syscall(struct uml_pt_regs *r)
goto out;
}
- /*
- * This should go in the declaration of syscall, but when I do that,
- * strace -f -c bash -c 'ls ; ls' breaks, sometimes not tracing
- * children at all, sometimes hanging when bash doesn't see the first
- * ls exit.
- * The assembly looks functionally the same to me. This is
- * gcc version 4.0.1 20050727 (Red Hat 4.0.1-5)
- * in case it's a compiler bug.
- */
- syscall = UPT_SYSCALL_NR(r);
+ syscall = get_syscall(r);
+
if ((syscall >= NR_SYSCALLS) || (syscall < 0))
result = -ENOSYS;
else result = EXECUTE_SYSCALL(syscall, regs);