3.2.65-rc1 review patch.  If anyone has any objections, please let me know.

------------------

From: Will Deacon <will.dea...@arm.com>

commit 60916a9382e88fbf5e54fd36a3e658efd7ab7bed upstream.

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.dea...@arm.com

Cc: Jason Baron <jba...@redhat.com>
Cc: Wade Farnsworth <wade_farnswo...@mentor.com>
Cc: Frederic Weisbecker <fweis...@gmail.com>
Signed-off-by: Will Deacon <will.dea...@arm.com>
Signed-off-by: Steven Rostedt <rost...@goodmis.org>
Signed-off-by: Ben Hutchings <b...@decadent.org.uk>
---
 kernel/trace/trace_syscalls.c | 4 ++++
 1 file changed, 4 insertions(+)

--- a/kernel/trace/trace_syscalls.c
+++ b/kernel/trace/trace_syscalls.c
@@ -519,6 +519,8 @@ static void perf_syscall_enter(void *ign
        int size;
 
        syscall_nr = syscall_get_nr(current, regs);
+       if (syscall_nr < 0)
+               return;
        if (!test_bit(syscall_nr, enabled_perf_enter_syscalls))
                return;
 
@@ -593,6 +595,8 @@ static void perf_syscall_exit(void *igno
        int size;
 
        syscall_nr = syscall_get_nr(current, regs);
+       if (syscall_nr < 0)
+               return;
        if (!test_bit(syscall_nr, enabled_perf_exit_syscalls))
                return;
 

--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to