perf/urgent fixes

Hi Ingo,

Please consider pulling,

- Arnaldo

The following changes since commit 8cc67c3b9366699b35775912e0bb91b4f845a57a:

Merge tag 'perf-urgent-for-mingo-2' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent (2015-05-01 08:30:26 +0200)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git tags/perf-urgent-for-mingo

for you to fetch changes up to e59d29e88f7b7e3d1231202b0203d0af6f15a440:

perf probe: Fix segfault if passed with ''. (2015-05-05 12:26:52 -0300)

----------------------------------------------------------------
perf/urgent fixes:

- Fix 'perf probe -a' segfault if passed with '' (Wang Nan)

- Fix report -T/--threads option (Namhyung Kim)

----------------------------------------------------------------
Namhyung Kim (1):
perf report: Fix -T/--threads option to work again

Wang Nan (1):
perf probe: Fix segfault if passed with ''.

 tools/perf/builtin-report.c   | 2 +-
 tools/perf/util/probe-event.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

From: Namhyung Kim <[email protected]>

The commit 512ae1bd6acb ("perf tools: Consolidate management of default sort orders") changed default value of the 'sort_order' variable to NULL indicating that users don't set any sort keys on the command line.

However it missed to update a check in perf_evlist__tty_browse_hists() so that 'perf report -T' cannot show the per-thread values after the normal output. This patch fixes it to work again.

Note that the -T option only works on --stdio and neither --sort nor --parent option was given.

---
 tools/perf/builtin-report.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 476cdf7..b63aeda 100644
@@ -329,7 +329,7 @@ static int perf_evlist__tty_browse_hists(struct perf_evlist *evlist,
 		fprintf(stdout, "\n\n");
 	}
 
-	if (sort_order == default_sort_order &&
+	if (sort_order == NULL &&
 	    parent_pattern == default_parent_pattern) {
 		fprintf(stdout, "#\n# (%s)\n#\n", help);
 

2.1.0

From: Wang Nan <[email protected]>

Since parse_perf_probe_point() deals with a user passed argument, we should not assume it to be a valid string.

Without this patch, if pass '' to perf probe, a segfault raises:

 $ perf probe -a ''
 Segmentation fault

This patch checks argument of parse_perf_probe_point() before string processing.

After this patch:

 $ perf probe -a ''

  usage: perf probe [<options>] 'PROBEDEF' ['PROBEDEF' ...]
     or: perf probe [<options>] --add 'PROBEDEF' [--add 'PROBEDEF' ...]
     ...

---
 tools/perf/util/probe-event.c | 2 ++
 1 file changed, 2 insertions(+)

index d8bb616..d05b77c 100644
@@ -1084,6 +1084,8 @@ static int parse_perf_probe_point(char *arg, struct perf_probe_event *pev)
 	 *
 	 * TODO:Group name support
 	 */
+	if (!arg)
+		return -EINVAL;
 
 	ptr = strpbrk(arg, ";=@+%");
 	if (ptr && *ptr == '=') {	/* Event name */

2.1.0

Pulled, thanks Arnaldo!

Ingo