[PATCH] perf: fix coredump caused by introduce of probe module option

[PATCH] perf: fix coredump caused by introduce of probe module option

[bookjovi]

From: root <root@localhost.localdomain>

perf will coredump if user don't give "-m" option in probe command,
this patch fix it.

[root@localhost perf]# ./perf probe --add='PROBE'
Segmentation fault (core dumped)

Signed-off-by: Jovi Zhang <bookjovi@gmail.com>
---
 tools/perf/util/probe-event.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index b82d54f..1c7bfa5 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -1820,11 +1820,15 @@ static int convert_to_probe_trace_events(struct perf_probe_event *pev,
 		ret = -ENOMEM;
 		goto error;
 	}
-	tev->point.module = strdup(module);
-	if (tev->point.module == NULL) {
-		ret = -ENOMEM;
-		goto error;
+
+	if (module) {
+		tev->point.module = strdup(module);
+		if (tev->point.module == NULL) {
+			ret = -ENOMEM;
+			goto error;
+		}
 	}
+
 	tev->point.offset = pev->point.offset;
 	tev->point.retprobe = pev->point.retprobe;
 	tev->nargs = pev->nargs;
-- 
1.6.5.2

Re: [PATCH] perf: fix coredump caused by introduce of probe module option

[Jovi Zhang]

On Mon, Jul 25, 2011 at 10:08 PM,  <bookjovi@gmail.com> wrote:
> From: root <root@localhost.localdomain>
>
> perf will coredump if user don't give "-m" option in probe command,
> this patch fix it.
>
> [root@localhost perf]# ./perf probe --add='PROBE'
> Segmentation fault (core dumped)
>
> Signed-off-by: Jovi Zhang <bookjovi@gmail.com>
> ---
>  tools/perf/util/probe-event.c |   12 ++++++++----
>  1 files changed, 8 insertions(+), 4 deletions(-)
>

Hi acme,
   Can this patch go through your tree?
   (Get rid of "From" field, that's suck. :))

.jovi

Re: [PATCH] perf: fix coredump caused by introduce of probe module option

[Arnaldo Carvalho de Melo]

Em Mon, Aug 08, 2011 at 11:01:19AM +0800, Jovi Zhang escreveu:
> On Mon, Jul 25, 2011 at 10:08 PM,  <bookjovi@gmail.com> wrote:
> > From: root <root@localhost.localdomain>
> >
> > perf will coredump if user don't give "-m" option in probe command,
> > this patch fix it.
> >
> > [root@localhost perf]# ./perf probe --add='PROBE'
> > Segmentation fault (core dumped)
> >
> > Signed-off-by: Jovi Zhang <bookjovi@gmail.com>
> > ---
> >  tools/perf/util/probe-event.c |   12 ++++++++----
> >  1 files changed, 8 insertions(+), 4 deletions(-)
> >
> 
> Hi acme,
>    Can this patch go through your tree?
>    (Get rid of "From" field, that's suck. :))

yeah, I'm applying it.

Thanks,

- Arnaldo

[tip:perf/urgent] perf probe: Fix coredump introduced by probe module option

[tip-bot for Jovi Zhang]

Commit-ID:  ce27a443d17dccf613079a7147cf0d220bc4ec82
Gitweb:     http://git.kernel.org/tip/ce27a443d17dccf613079a7147cf0d220bc4ec82
Author:     Jovi Zhang <bookjovi@gmail.com>
AuthorDate: Mon, 25 Jul 2011 22:08:08 +0800
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 8 Aug 2011 09:35:41 -0300

perf probe: Fix coredump introduced by probe module option

perf will coredump if the user doesn't give the "-m" option in probe
command, this patch fixes it.

[root@localhost perf]# ./perf probe --add='PROBE'
Segmentation fault (core dumped)

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1311602888-2389-1-git-send-email-bookjovi@gmail.com
Signed-off-by: Jovi Zhang <bookjovi@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/probe-event.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index b82d54f..1c7bfa5 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -1820,11 +1820,15 @@ static int convert_to_probe_trace_events(struct perf_probe_event *pev,
 		ret = -ENOMEM;
 		goto error;
 	}
-	tev->point.module = strdup(module);
-	if (tev->point.module == NULL) {
-		ret = -ENOMEM;
-		goto error;
+
+	if (module) {
+		tev->point.module = strdup(module);
+		if (tev->point.module == NULL) {
+			ret = -ENOMEM;
+			goto error;
+		}
 	}
+
 	tev->point.offset = pev->point.offset;
 	tev->point.retprobe = pev->point.retprobe;
 	tev->nargs = pev->nargs;