From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753502AbbIWIne (ORCPT ); Wed, 23 Sep 2015 04:43:34 -0400 Received: from terminus.zytor.com ([198.137.202.10]:34791 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753158AbbIWIn3 (ORCPT ); Wed, 23 Sep 2015 04:43:29 -0400 Date: Wed, 23 Sep 2015 01:43:06 -0700 From: tip-bot for Masami Hiramatsu Message-ID: Cc: masami.hiramatsu.pt@hitachi.com, mingo@kernel.org, acme@redhat.com, hpa@zytor.com, namhyung@kernel.org, milian.wolff@kdab.com, tglx@linutronix.de, linux-kernel@vger.kernel.org Reply-To: acme@redhat.com, hpa@zytor.com, milian.wolff@kdab.com, tglx@linutronix.de, namhyung@kernel.org, linux-kernel@vger.kernel.org, masami.hiramatsu.pt@hitachi.com, mingo@kernel.org In-Reply-To: <20150916125241.4446.44805.stgit@localhost.localdomain> References: <20150916125241.4446.44805.stgit@localhost.localdomain> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf probe: Fix a segfault when removing uprobe events Git-Commit-ID: 0fb18553478dee5b3d8dc0af4f99a5288e81142f 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: 0fb18553478dee5b3d8dc0af4f99a5288e81142f Gitweb: http://git.kernel.org/tip/0fb18553478dee5b3d8dc0af4f99a5288e81142f Author: Masami Hiramatsu AuthorDate: Wed, 16 Sep 2015 21:52:42 +0900 Committer: Arnaldo Carvalho de Melo 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 Signed-off-by: Masami Hiramatsu Cc: Namhyung Kim Link: http://lkml.kernel.org/r/20150916125241.4446.44805.stgit@localhost.localdomain Signed-off-by: Arnaldo Carvalho de Melo --- 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) {