From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757396AbbCNHGu (ORCPT ); Sat, 14 Mar 2015 03:06:50 -0400 Received: from terminus.zytor.com ([198.137.202.10]:40330 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753179AbbCNHGr (ORCPT ); Sat, 14 Mar 2015 03:06:47 -0400 Date: Sat, 14 Mar 2015 00:06:33 -0700 From: tip-bot for Namhyung Kim Message-ID: Cc: dsahern@gmail.com, jolsa@redhat.com, hpa@zytor.com, mingo@kernel.org, namhyung@kernel.org, acme@redhat.com, tglx@linutronix.de, js1304@gmail.com, a.p.zijlstra@chello.nl, linux-kernel@vger.kernel.org, minchan@kernel.org Reply-To: jolsa@redhat.com, hpa@zytor.com, dsahern@gmail.com, tglx@linutronix.de, mingo@kernel.org, acme@redhat.com, namhyung@kernel.org, a.p.zijlstra@chello.nl, linux-kernel@vger.kernel.org, js1304@gmail.com, minchan@kernel.org In-Reply-To: <1426145571-3065-2-git-send-email-namhyung@kernel.org> References: <1426145571-3065-2-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf kmem: Fix segfault when invalid sort key is given Git-Commit-ID: 405f87557da35a03ba4663eca971ffac58b0a818 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 405f87557da35a03ba4663eca971ffac58b0a818 Gitweb: http://git.kernel.org/tip/405f87557da35a03ba4663eca971ffac58b0a818 Author: Namhyung Kim AuthorDate: Thu, 12 Mar 2015 16:32:46 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 13 Mar 2015 07:47:47 -0300 perf kmem: Fix segfault when invalid sort key is given When it tries to free 'str', it was already updated by strsep() - so it needs to save the original pointer. # perf kmem stat -s xxx,hit Error: Unknown --sort key: 'xxx' *** Error in `perf': free(): invalid pointer: 0x0000000000e9e7b6 *** ======= Backtrace: ========= /usr/lib/libc.so.6(+0x7198e)[0x7fc7e6e0d98e] /usr/lib/libc.so.6(+0x76dee)[0x7fc7e6e12dee] /usr/lib/libc.so.6(+0x775cb)[0x7fc7e6e135cb] ./perf[0x44a1b5] ./perf[0x490b20] ./perf(parse_options_step+0x173)[0x491773] ./perf(parse_options_subcommand+0xa7)[0x491fb7] ./perf(cmd_kmem+0x2bc)[0x44ae4c] ./perf[0x47aa13] ./perf(main+0x60a)[0x427a9a] /usr/lib/libc.so.6(__libc_start_main+0xf0)[0x7fc7e6dbc800] ./perf(_start+0x29)[0x427bb9] Signed-off-by: Namhyung Kim Tested-by: Arnaldo Carvalho de Melo Cc: David Ahern Cc: Ingo Molnar Cc: Jiri Olsa Cc: Joonsoo Kim Cc: Minchan Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1426145571-3065-2-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-kmem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c index 62f165a..1e69ea5 100644 --- a/tools/perf/builtin-kmem.c +++ b/tools/perf/builtin-kmem.c @@ -559,6 +559,7 @@ static int setup_sorting(struct list_head *sort_list, const char *arg) { char *tok; char *str = strdup(arg); + char *pos = str; if (!str) { pr_err("%s: strdup failed\n", __func__); @@ -566,7 +567,7 @@ static int setup_sorting(struct list_head *sort_list, const char *arg) } while (true) { - tok = strsep(&str, ","); + tok = strsep(&pos, ","); if (!tok) break; if (sort_dimension__add(tok, sort_list) < 0) {