[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <4AAF6726.5090905@bk.jp.nec.com>
Date: Tue, 15 Sep 2009 19:06:30 +0900
From: Atsushi Tsuji <a-tsuji@...jp.nec.com>
To: linux-kernel@...r.kernel.org, rostedt@...dmis.org,
Ingo Molnar <mingo@...e.hu>, fweisbec@...il.com,
"Frank Ch. Eigler" <fche@...hat.com>
CC: Peter Zijlstra <peterz@...radead.org>, paulus@...ba.org,
systemtap@...rces.redhat.com
Subject: [PATCH 1/2] 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@...jp.nec.com>
---
kernel/trace/ftrace.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 8c804e2..5ef8f59 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -2059,9 +2059,9 @@ __unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
int i, len = 0;
char *search;
- if (glob && (strcmp(glob, "*") || !strlen(glob)))
+ if (glob && (strcmp(glob, "*") == 0 || !strlen(glob)))
glob = NULL;
- else {
+ else if (glob) {
int not;
type = ftrace_setup_glob(glob, strlen(glob), &search, ¬);
--
1.5.5.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists