From: Steven Rostedt <srostedt@redhat.com>
Date: Mon, 25 Jan 2010 20:11:53 +0000 (-0500)
Subject: tracing: Prevent kernel oops with corrupted buffer
X-Git-Tag: v2.6.33-rc7~52^2~4
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=74bf4076f2ed79b5510440b72a561823a8852ec0;p=net-next-2.6.git

tracing: Prevent kernel oops with corrupted buffer

If the contents of the ftrace ring buffer gets corrupted and the trace
file is read, it could create a kernel oops (usualy just killing the user
task thread). This is caused by the checking of the pid in the buffer.
If the pid is negative, it still references the cmdline cache array,
which could point to an invalid address.

The simple fix is to test for negative PIDs.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 0df1b0f2cb9..eac6875cb99 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -951,6 +951,11 @@ void trace_find_cmdline(int pid, char comm[])
 		return;
 	}
 
+	if (WARN_ON_ONCE(pid < 0)) {
+		strcpy(comm, "<XXX>");
+		return;
+	}
+
 	if (pid > PID_MAX_DEFAULT) {
 		strcpy(comm, "<...>");
 		return;