[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1253106398.20020.192.camel@gandalf.stny.rr.com>
Date: Wed, 16 Sep 2009 09:06:38 -0400
From: Steven Rostedt <rostedt@...dmis.org>
To: Atsushi Tsuji <a-tsuji@...jp.nec.com>
Cc: linux-kernel@...r.kernel.org, Ingo Molnar <mingo@...e.hu>,
fweisbec@...il.com, "Frank Ch. Eigler" <fche@...hat.com>,
Peter Zijlstra <peterz@...radead.org>, paulus@...ba.org,
systemtap@...rces.redhat.com
Subject: Re: [PATCH 1/2] tracing: Fix minor bugs for
__unregister_ftrace_function_probe
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@...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, ¬);
--
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