From: tip-bot for Will Deacon <will.deacon@arm.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
will.deacon@arm.com, wade_farnsworth@mentor.com,
fweisbec@gmail.com, rostedt@goodmis.org, tglx@linutronix.de,
jbaron@redhat.com
Subject: [tip:perf/urgent] tracing/syscalls: Fix perf syscall tracing when syscall_nr == -1
Date: Tue, 21 Aug 2012 09:28:22 -0700 [thread overview]
Message-ID: <tip-60916a9382e88fbf5e54fd36a3e658efd7ab7bed@git.kernel.org> (raw)
In-Reply-To: <1345137254-7377-1-git-send-email-will.deacon@arm.com>
Commit-ID: 60916a9382e88fbf5e54fd36a3e658efd7ab7bed
Gitweb: http://git.kernel.org/tip/60916a9382e88fbf5e54fd36a3e658efd7ab7bed
Author: Will Deacon <will.deacon@arm.com>
AuthorDate: Thu, 16 Aug 2012 18:14:14 +0100
Committer: Steven Rostedt <rostedt@goodmis.org>
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.
Link: http://lkml.kernel.org/r/1345137254-7377-1-git-send-email-will.deacon@arm.com
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>
---
kernel/trace/trace_syscalls.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
index 60e4d78..6b245f64 100644
--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@ -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;
prev parent reply other threads:[~2012-08-21 16:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-16 17:14 [PATCH] tracing/syscalls: fix " Will Deacon
2012-08-21 16:28 ` tip-bot for Will Deacon [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-60916a9382e88fbf5e54fd36a3e658efd7ab7bed@git.kernel.org \
--to=will.deacon@arm.com \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=jbaron@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=wade_farnsworth@mentor.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome