projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'bcm5301x-dt-2014-12-04' of https://github.com/hauke/linux into next/dt
[cascardo/linux.git]
/
kernel
/
trace
/
trace_syscalls.c
diff --git
a/kernel/trace/trace_syscalls.c
b/kernel/trace/trace_syscalls.c
index
4dc8b79
..
29228c4
100644
(file)
--- a/
kernel/trace/trace_syscalls.c
+++ b/
kernel/trace/trace_syscalls.c
@@
-313,7
+313,7
@@
static void ftrace_syscall_enter(void *data, struct pt_regs *regs, long id)
int size;
syscall_nr = trace_get_syscall_nr(current, regs);
int size;
syscall_nr = trace_get_syscall_nr(current, regs);
- if (syscall_nr < 0)
+ if (syscall_nr < 0
|| syscall_nr >= NR_syscalls
)
return;
/* Here we're inside tp handler's rcu_read_lock_sched (__DO_TRACE) */
return;
/* Here we're inside tp handler's rcu_read_lock_sched (__DO_TRACE) */
@@
-360,7
+360,7
@@
static void ftrace_syscall_exit(void *data, struct pt_regs *regs, long ret)
int syscall_nr;
syscall_nr = trace_get_syscall_nr(current, regs);
int syscall_nr;
syscall_nr = trace_get_syscall_nr(current, regs);
- if (syscall_nr < 0)
+ if (syscall_nr < 0
|| syscall_nr >= NR_syscalls
)
return;
/* Here we're inside tp handler's rcu_read_lock_sched (__DO_TRACE()) */
return;
/* Here we're inside tp handler's rcu_read_lock_sched (__DO_TRACE()) */
@@
-567,7
+567,7
@@
static void perf_syscall_enter(void *ignore, struct pt_regs *regs, long id)
int size;
syscall_nr = trace_get_syscall_nr(current, regs);
int size;
syscall_nr = trace_get_syscall_nr(current, regs);
- if (syscall_nr < 0)
+ if (syscall_nr < 0
|| syscall_nr >= NR_syscalls
)
return;
if (!test_bit(syscall_nr, enabled_perf_enter_syscalls))
return;
return;
if (!test_bit(syscall_nr, enabled_perf_enter_syscalls))
return;
@@
-641,7
+641,7
@@
static void perf_syscall_exit(void *ignore, struct pt_regs *regs, long ret)
int size;
syscall_nr = trace_get_syscall_nr(current, regs);
int size;
syscall_nr = trace_get_syscall_nr(current, regs);
- if (syscall_nr < 0)
+ if (syscall_nr < 0
|| syscall_nr >= NR_syscalls
)
return;
if (!test_bit(syscall_nr, enabled_perf_exit_syscalls))
return;
return;
if (!test_bit(syscall_nr, enabled_perf_exit_syscalls))
return;