mirror of
https://github.com/torvalds/linux
synced 2024-09-28 07:20:56 +00:00
e5cf888631
Fixes a bug introduced in commit e32dacb9f4 -
index is initialized based on syscall before syscall is calculated.
I'm bothering with this mainly because it gives a correct warning when the
config option is enabled, even if the code is for a almost unused debugging
option.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
57 lines
1.2 KiB
C
57 lines
1.2 KiB
C
/*
|
|
* Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)
|
|
* Licensed under the GPL
|
|
*/
|
|
|
|
#include "linux/types.h"
|
|
#include "linux/utime.h"
|
|
#include "linux/sys.h"
|
|
#include "linux/ptrace.h"
|
|
#include "asm/unistd.h"
|
|
#include "asm/ptrace.h"
|
|
#include "asm/uaccess.h"
|
|
#include "asm/stat.h"
|
|
#include "sysdep/syscalls.h"
|
|
#include "sysdep/sigcontext.h"
|
|
#include "kern_util.h"
|
|
#include "syscall.h"
|
|
|
|
void syscall_handler_tt(int sig, struct pt_regs *regs)
|
|
{
|
|
void *sc;
|
|
long result;
|
|
int syscall;
|
|
#ifdef CONFIG_SYSCALL_DEBUG
|
|
int index;
|
|
#endif
|
|
sc = UPT_SC(®s->regs);
|
|
SC_START_SYSCALL(sc);
|
|
|
|
syscall = UPT_SYSCALL_NR(®s->regs);
|
|
|
|
#ifdef CONFIG_SYSCALL_DEBUG
|
|
index = record_syscall_start(syscall);
|
|
#endif
|
|
|
|
syscall_trace(®s->regs, 0);
|
|
|
|
current->thread.nsyscalls++;
|
|
nsyscalls++;
|
|
|
|
if((syscall >= NR_syscalls) || (syscall < 0))
|
|
result = -ENOSYS;
|
|
else result = EXECUTE_SYSCALL(syscall, regs);
|
|
|
|
/* regs->sc may have changed while the system call ran (there may
|
|
* have been an interrupt or segfault), so it needs to be refreshed.
|
|
*/
|
|
UPT_SC(®s->regs) = sc;
|
|
|
|
SC_SET_SYSCALL_RETURN(sc, result);
|
|
|
|
syscall_trace(®s->regs, 1);
|
|
#ifdef CONFIG_SYSCALL_DEBUG
|
|
record_syscall_end(index, result);
|
|
#endif
|
|
}
|