Messages in this thread | | | Subject | Re: [PATCH 1/2] tracing: Fix minor bugs for __unregister_ftrace_function_probe | From | Steven Rostedt <> | Date | Wed, 16 Sep 2009 09:06:38 -0400 |
| |
On Tue, 2009-09-15 at 19:06 +0900, Atsushi Tsuji wrote: > 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>
This is a real fix, I'll pull it in separately.
Thanks!
-- Steve
> --- > 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, ¬);
| |