aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhaolei <zhaolei@cn.fujitsu.com>2009-03-25 00:06:05 -0400
committerSteven Rostedt <srostedt@redhat.com>2009-03-25 17:45:36 -0400
commit2a4efa42450762cbfa5c5712aa4cc9f06924c9fd (patch)
tree70af0a079541af99dec634fc89ce317dee2f1a33
parent759ee0915dd713361e72facb78b66600b5712d65 (diff)
ftrace: Using FTRACE_WARN_ON() to check "freed record" in ftrace_release()
"Because when we call ftrace_free_rec we change the rec->ip to point to the next record in the chain. Something is very wrong if rec->ip >= s && rec->ip < e and the record is already free." "Note, use FTRACE_WARN_ON() macro. This way it shuts down ftrace if it is hit and helps to avoid further damage later." -- Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com> Signed-off-by: Steven Rostedt <srostedt@redhat.com>
-rw-r--r--kernel/trace/ftrace.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 7b8722baf153..1752a63f37c0 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -358,9 +358,14 @@ void ftrace_release(void *start, unsigned long size)
358 358
359 mutex_lock(&ftrace_lock); 359 mutex_lock(&ftrace_lock);
360 do_for_each_ftrace_rec(pg, rec) { 360 do_for_each_ftrace_rec(pg, rec) {
361 if ((rec->ip >= s) && (rec->ip < e) && 361 if ((rec->ip >= s) && (rec->ip < e)) {
362 !(rec->flags & FTRACE_FL_FREE)) 362 /*
363 * rec->ip is changed in ftrace_free_rec()
364 * It should not between s and e if record was freed.
365 */
366 FTRACE_WARN_ON(rec->flags & FTRACE_FL_FREE);
363 ftrace_free_rec(rec); 367 ftrace_free_rec(rec);
368 }
364 } while_for_each_ftrace_rec(); 369 } while_for_each_ftrace_rec();
365 mutex_unlock(&ftrace_lock); 370 mutex_unlock(&ftrace_lock);
366} 371}