Skip to contentSkip to conversation

tracing/syscalls: fix perf syscall tracing when syscall_nr == -1

PATCH In review Will Deacon 1 participant 2 messages Aug 16, 2012 – Aug 21, 2012 Tracing

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

Cc Jason Baron <[email protected]>
Cc Wade Farnsworth <[email protected]>
Cc Steven Rostedt <[email protected]>
Cc Frederic Weisbecker <[email protected]>
---
 kernel/trace/trace_syscalls.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
kernel/trace/trace_syscalls.c +4 -0
index 96fc733..4bc7d92 100644
@@ -506,6 +506,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;
 
@@ -580,6 +582,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;
 
Signature · 1 line
1.7.4.1
#1 lore raw

[tip:perf/urgent] tracing/syscalls: Fix perf syscall tracing when syscall_nr == -1

Commit-ID:  60916a9382e88fbf5e54fd36a3e658efd7ab7bed
Gitweb:     http://git.kernel.org/tip/60916a9382e88fbf5e54fd36a3e658efd7ab7bed
Author:     Will Deacon <[email protected]>
AuthorDate: Thu, 16 Aug 2012 18:14:14 +0100
Committer:  Steven Rostedt <[email protected]>
CommitDate: Fri, 17 Aug 2012 15:19:46 -0400

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.

Cc Jason Baron <[email protected]>
Cc Wade Farnsworth <[email protected]>
Cc Frederic Weisbecker <[email protected]>
---
 kernel/trace/trace_syscalls.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
kernel/trace/trace_syscalls.c +4 -0
index 60e4d78..6b245f64 100644
@@ -506,6 +506,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;
 
@@ -580,6 +582,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;