aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2012-08-16 18:14:14 +0100
committerSimon Shields <keepcalm444@gmail.com>2016-03-15 17:41:30 +1100
commitc2710a162474f0fba1018167499c3c5b4a5e4ce7 (patch)
tree8beef2c817e85d5fef2a391674dbbe23c0b2d0cc /kernel
parent07c64da538554085466e9338e19f033438a0a5bf (diff)
downloadkernel_samsung_smdk4412-c2710a162474f0fba1018167499c3c5b4a5e4ce7.tar.gz
kernel_samsung_smdk4412-c2710a162474f0fba1018167499c3c5b4a5e4ce7.tar.bz2
kernel_samsung_smdk4412-c2710a162474f0fba1018167499c3c5b4a5e4ce7.zip
tracing/syscalls: Fix perf syscall tracing when syscall_nr == -1
syscall_get_nr can return -1 in the case that the task is not executing a system call. This patch fixes perf_syscall_{enter,exit} to check that the syscall number is valid before using it as an index into a bitmap. Link: http://lkml.kernel.org/r/1345137254-7377-1-git-send-email-will.deacon@arm.com Change-Id: Iedc719957e184c6572b3ad94e241ae2a97a0b533 Cc: Jason Baron <jbaron@redhat.com> Cc: Wade Farnsworth <wade_farnsworth@mentor.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/trace_syscalls.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index 5819cd5cf7c..d6803a49d65 100644
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@ -518,6 +518,8 @@ static void perf_syscall_enter(void *ignore, struct pt_regs *regs, long id)
int size;
syscall_nr = syscall_get_nr(current, regs);
+ if (syscall_nr < 0)
+ return;
if (!test_bit(syscall_nr, enabled_perf_enter_syscalls))
return;
@@ -592,6 +594,8 @@ static void perf_syscall_exit(void *ignore, struct pt_regs *regs, long ret)
int size;
syscall_nr = syscall_get_nr(current, regs);
+ if (syscall_nr < 0)
+ return;
if (!test_bit(syscall_nr, enabled_perf_exit_syscalls))
return;