From: Steven Rostedt Date: Fri, 2 Nov 2012 21:01:20 +0000 (-0400) Subject: ftrace: Fix function tracing recursion self test X-Git-Tag: MMI-PSA29.97-13-9~15047^2~18^2~7 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9640388b63556b4cfecbb5aaf91a5c99d272f429;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git ftrace: Fix function tracing recursion self test The function tracing recursion self test should not crash the machine if the resursion test fails. If it detects that the function tracing is recursing when it should not be, then bail, don't go into an infinite recursive loop. Signed-off-by: Steven Rostedt --- diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c index adb008a0136f..51c819c12c29 100644 --- a/kernel/trace/trace_selftest.c +++ b/kernel/trace/trace_selftest.c @@ -415,7 +415,8 @@ static void trace_selftest_test_recursion_func(unsigned long ip, * The ftrace infrastructure should provide the recursion * protection. If not, this will crash the kernel! */ - trace_selftest_recursion_cnt++; + if (trace_selftest_recursion_cnt++ > 10) + return; DYN_FTRACE_TEST_NAME(); }