aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/ftrace.c
diff options
context:
space:
mode:
authorAtsushi Tsuji <a-tsuji@bk.jp.nec.com>2009-09-15 06:06:30 -0400
committerSteven Rostedt <rostedt@goodmis.org>2009-09-16 09:08:54 -0400
commitb36461da2a0389149d7f88f3cbc05a30d1db9faa (patch)
treec9a4a6414185474e106d538705089a3fa3506a45 /kernel/trace/ftrace.c
parentfe832a3a48737b24f95fab202b1c67fb588b071d (diff)
tracing: Fix minor bugs for __unregister_ftrace_function_probe
Fix the condition of strcmp for "*". Also fix NULL pointer dereference when glob is NULL. Signed-off-by: Atsushi Tsuji <a-tsuji@bk.jp.nec.com> LKML-Reference: <4AAF6726.5090905@bk.jp.nec.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace/ftrace.c')
-rw-r--r--kernel/trace/ftrace.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 8b23d5670088..f7ab7fc162cc 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -2062,9 +2062,9 @@ __unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
2062 int i, len = 0; 2062 int i, len = 0;
2063 char *search; 2063 char *search;
2064 2064
2065 if (glob && (strcmp(glob, "*") || !strlen(glob))) 2065 if (glob && (strcmp(glob, "*") == 0 || !strlen(glob)))
2066 glob = NULL; 2066 glob = NULL;
2067 else { 2067 else if (glob) {
2068 int not; 2068 int not;
2069 2069
2070 type = ftrace_setup_glob(glob, strlen(glob), &search, &not); 2070 type = ftrace_setup_glob(glob, strlen(glob), &search, &not);