2009-09-15 10:09:45

by tip-bot for Atsushi Tsuji

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 <[email protected]>
---
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, &not);
--
1.5.5.1

2009-09-16 13:06:50

by Steven Rostedt

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 <[email protected]>


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, &not);

2009-09-17 07:48:55

by tip-bot for Atsushi Tsuji

Subject: [tip:tracing/core] tracing: Fix minor bugs for __unregister_ftrace_function_probe

Commit-ID: b36461da2a0389149d7f88f3cbc05a30d1db9faa
Gitweb: http://git.kernel.org/tip/b36461da2a0389149d7f88f3cbc05a30d1db9faa
Author: Atsushi Tsuji <[email protected]>
AuthorDate: Tue, 15 Sep 2009 19:06:30 +0900
Committer: Steven Rostedt <[email protected]>
CommitDate: Wed, 16 Sep 2009 09:08:54 -0400

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 <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Steven Rostedt <[email protected]>


---
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 8b23d56..f7ab7fc 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,
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, &not);