[PATCH perf/core ] [BUGFIX] perf probe: Fix a segfault when removing uprobe events

[PATCH perf/core ] [BUGFIX] perf probe: Fix a segfault when removing uprobe events

[Masami Hiramatsu]

Fix a segfault bug and a small mistake in perf probe -d.

Since the "ulist" in perf_del_probe_events is never initialized,
strlist__add(ulist, *) always causes a segfault when removing
uprobe events by perf probe -d.

Also, the "str" local variable is never released if fail to
allocate the "klist". This fixes it too.

This has been introduced by the commit e607f1426b58 ("perf probe:
Print deleted events in cmd_probe()").

Reported-by: Milian Wolff <milian.wolff@kdab.com>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
---
 tools/perf/builtin-probe.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
index 94385ee..f7882ae 100644
--- a/tools/perf/builtin-probe.c
+++ b/tools/perf/builtin-probe.c
@@ -380,8 +380,11 @@ static int perf_del_probe_events(struct strfilter *filter)
 		goto out;
 
 	klist = strlist__new(NULL, NULL);
-	if (!klist)
-		return -ENOMEM;
+	ulist = strlist__new(NULL, NULL);
+	if (!klist || !ulist) {
+		ret = -ENOMEM;
+		goto out;
+	}
 
 	ret = probe_file__get_events(kfd, filter, klist);
 	if (ret == 0) {

RE: [PATCH perf/core ] [BUGFIX] perf probe: Fix a segfault when removing uprobe events

[平松雅巳 / HIRAMATU，MASAMI]

Hi Arnaldo,

Could you pull this bugfix as an urgent patch, since this fixes a critical
problem?

Thanks,

From: Masami Hiramatsu [mailto:masami.hiramatsu.pt@hitachi.com]
>
>Fix a segfault bug and a small mistake in perf probe -d.
>
>Since the "ulist" in perf_del_probe_events is never initialized,
>strlist__add(ulist, *) always causes a segfault when removing
>uprobe events by perf probe -d.
>
>Also, the "str" local variable is never released if fail to
>allocate the "klist". This fixes it too.
>
>This has been introduced by the commit e607f1426b58 ("perf probe:
>Print deleted events in cmd_probe()").
>
>Reported-by: Milian Wolff <milian.wolff@kdab.com>
>Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
>---
> tools/perf/builtin-probe.c |    7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
>diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
>index 94385ee..f7882ae 100644
>--- a/tools/perf/builtin-probe.c
>+++ b/tools/perf/builtin-probe.c
>@@ -380,8 +380,11 @@ static int perf_del_probe_events(struct strfilter *filter)
> 		goto out;
>
> 	klist = strlist__new(NULL, NULL);
>-	if (!klist)
>-		return -ENOMEM;
>+	ulist = strlist__new(NULL, NULL);
>+	if (!klist || !ulist) {
>+		ret = -ENOMEM;
>+		goto out;
>+	}
>
> 	ret = probe_file__get_events(kfd, filter, klist);
> 	if (ret == 0) {
>

RE: [PATCH perf/core ] [BUGFIX] perf probe: Fix a segfault when removing uprobe events

[平松雅巳 / HIRAMATU，MASAMI]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 1507 bytes --]

Hi Arnaldo,

Could you pull this bugfix as an urgent patch, since this fixes a critical
problem?

Thanks,

From: Masami Hiramatsu [mailto:masami.hiramatsu.pt@hitachi.com]
>
>Fix a segfault bug and a small mistake in perf probe -d.
>
>Since the "ulist" in perf_del_probe_events is never initialized,
>strlist__add(ulist, *) always causes a segfault when removing
>uprobe events by perf probe -d.
>
>Also, the "str" local variable is never released if fail to
>allocate the "klist". This fixes it too.
>
>This has been introduced by the commit e607f1426b58 ("perf probe:
>Print deleted events in cmd_probe()").
>
>Reported-by: Milian Wolff <milian.wolff@kdab.com>
>Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
>---
> tools/perf/builtin-probe.c |    7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
>diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
>index 94385ee..f7882ae 100644
>--- a/tools/perf/builtin-probe.c
>+++ b/tools/perf/builtin-probe.c
>@@ -380,8 +380,11 @@ static int perf_del_probe_events(struct strfilter *filter)
> 		goto out;
>
> 	klist = strlist__new(NULL, NULL);
>-	if (!klist)
>-		return -ENOMEM;
>+	ulist = strlist__new(NULL, NULL);
>+	if (!klist || !ulist) {
>+		ret = -ENOMEM;
>+		goto out;
>+	}
>
> 	ret = probe_file__get_events(kfd, filter, klist);
> 	if (ret == 0) {
>

ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥

Re: [PATCH perf/core ] [BUGFIX] perf probe: Fix a segfault when removing uprobe events

[Arnaldo Carvalho de Melo]

Em Fri, Sep 18, 2015 at 01:39:13AM +0000, 平松雅巳 / HIRAMATU，MASAMI escreveu:
> Hi Arnaldo,
> 
> Could you pull this bugfix as an urgent patch, since this fixes a critical
> problem?

Sure, thanks for the reminder.

- Arnaldo
 
> Thanks,
> 
> From: Masami Hiramatsu [mailto:masami.hiramatsu.pt@hitachi.com]
> >
> >Fix a segfault bug and a small mistake in perf probe -d.
> >
> >Since the "ulist" in perf_del_probe_events is never initialized,
> >strlist__add(ulist, *) always causes a segfault when removing
> >uprobe events by perf probe -d.
> >
> >Also, the "str" local variable is never released if fail to
> >allocate the "klist". This fixes it too.
> >
> >This has been introduced by the commit e607f1426b58 ("perf probe:
> >Print deleted events in cmd_probe()").
> >
> >Reported-by: Milian Wolff <milian.wolff@kdab.com>
> >Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> >---
> > tools/perf/builtin-probe.c |    7 +++++--
> > 1 file changed, 5 insertions(+), 2 deletions(-)
> >
> >diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
> >index 94385ee..f7882ae 100644
> >--- a/tools/perf/builtin-probe.c
> >+++ b/tools/perf/builtin-probe.c
> >@@ -380,8 +380,11 @@ static int perf_del_probe_events(struct strfilter *filter)
> > 		goto out;
> >
> > 	klist = strlist__new(NULL, NULL);
> >-	if (!klist)
> >-		return -ENOMEM;
> >+	ulist = strlist__new(NULL, NULL);
> >+	if (!klist || !ulist) {
> >+		ret = -ENOMEM;
> >+		goto out;
> >+	}
> >
> > 	ret = probe_file__get_events(kfd, filter, klist);
> > 	if (ret == 0) {
> >
> 

Re: [PATCH perf/core ] [BUGFIX] perf probe: Fix a segfault when removing uprobe events

[Arnaldo Carvalho de Melo]

Em Fri, Sep 18, 2015 at 11:26:22AM -0300, Arnaldo Carvalho de Melo escreveu:
> Em Fri, Sep 18, 2015 at 01:39:13AM +0000, 平松雅巳 / HIRAMATU，MASAMI escreveu:
> > Hi Arnaldo,
> > 
> > Could you pull this bugfix as an urgent patch, since this fixes a critical
> > problem?
> 
> Sure, thanks for the reminder.

But it is not applying, checking:


[acme@zoo linux]$ patch -p1 < /wb/1.patch 
patching file tools/perf/builtin-probe.c
Hunk #1 FAILED at 380.
1 out of 1 hunk FAILED -- saving rejects to file tools/perf/builtin-probe.c.rej
[acme@zoo linux]$ 


- Arnaldo

Re: [PATCH perf/core ] [BUGFIX] perf probe: Fix a segfault when removing uprobe events

[Arnaldo Carvalho de Melo]

Em Fri, Sep 18, 2015 at 11:28:30AM -0300, Arnaldo Carvalho de Melo escreveu:
> Em Fri, Sep 18, 2015 at 11:26:22AM -0300, Arnaldo Carvalho de Melo escreveu:
> > Em Fri, Sep 18, 2015 at 01:39:13AM +0000, 平松雅巳 / HIRAMATU，MASAMI escreveu:
> > > Could you pull this bugfix as an urgent patch, since this fixes a critical
> > > problem?

> > Sure, thanks for the reminder.
 
> But it is not applying, checking:
 
> [acme@zoo linux]$ patch -p1 < /wb/1.patch 
> patching file tools/perf/builtin-probe.c
> Hunk #1 FAILED at 380.
> 1 out of 1 hunk FAILED -- saving rejects to file tools/perf/builtin-probe.c.rej
> [acme@zoo linux]$ 

The way you reported made me somehow think this was for perf/urgent, but
the function it patches is not even there, ok, applying to perf/core.

Applied.

- Arnaldo

Re: [PATCH perf/core ] [BUGFIX] perf probe: Fix a segfault when removing uprobe events

[Paul Clarke]

On 09/16/2015 07:52 AM, Masami Hiramatsu wrote:
> Fix a segfault bug and a small mistake in perf probe -d.
>
> Since the "ulist" in perf_del_probe_events is never initialized,
> strlist__add(ulist, *) always causes a segfault when removing
> uprobe events by perf probe -d.
>
> Also, the "str" local variable is never released if fail to
> allocate the "klist". This fixes it too.
>
> This has been introduced by the commit e607f1426b58 ("perf probe:
> Print deleted events in cmd_probe()").
>
> Reported-by: Milian Wolff <milian.wolff@kdab.com>
> Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
> ---
>   tools/perf/builtin-probe.c |    7 +++++--
>   1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
> index 94385ee..f7882ae 100644
> --- a/tools/perf/builtin-probe.c
> +++ b/tools/perf/builtin-probe.c
> @@ -380,8 +380,11 @@ static int perf_del_probe_events(struct strfilter *filter)
>   		goto out;
>
>   	klist = strlist__new(NULL, NULL);
> -	if (!klist)
> -		return -ENOMEM;
> +	ulist = strlist__new(NULL, NULL);
> +	if (!klist || !ulist) {
> +		ret = -ENOMEM;
> +		goto out;
> +	}

Newbie here, but if one of "strlist__new()" calls succeeds, don't you 
need a corresponding strlist__delete() ?

PC

[tip:perf/core] perf probe: Fix a segfault when removing uprobe events

[tip-bot for Masami Hiramatsu]

Commit-ID:  0fb18553478dee5b3d8dc0af4f99a5288e81142f
Gitweb:     http://git.kernel.org/tip/0fb18553478dee5b3d8dc0af4f99a5288e81142f
Author:     Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
AuthorDate: Wed, 16 Sep 2015 21:52:42 +0900
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 21 Sep 2015 18:01:17 -0300

perf probe: Fix a segfault when removing uprobe events

Fix a segfault bug and a small mistake in perf probe -d.

Since the "ulist" in perf_del_probe_events is never initialized,
strlist__add(ulist, *) always causes a segfault when removing
uprobe events by perf probe -d.

Also, the "str" local variable is never released if fail to
allocate the "klist". This fixes it too.

This has been introduced by the commit e607f1426b58 ("perf probe:
Print deleted events in cmd_probe()").

Reported-by: Milian Wolff <milian.wolff@kdab.com>
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/20150916125241.4446.44805.stgit@localhost.localdomain
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/builtin-probe.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
index 94385ee..f7882ae 100644
--- a/tools/perf/builtin-probe.c
+++ b/tools/perf/builtin-probe.c
@@ -380,8 +380,11 @@ static int perf_del_probe_events(struct strfilter *filter)
 		goto out;
 
 	klist = strlist__new(NULL, NULL);
-	if (!klist)
-		return -ENOMEM;
+	ulist = strlist__new(NULL, NULL);
+	if (!klist || !ulist) {
+		ret = -ENOMEM;
+		goto out;
+	}
 
 	ret = probe_file__get_events(kfd, filter, klist);
 	if (ret == 0) {