From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753952AbcFPIck (ORCPT ); Thu, 16 Jun 2016 04:32:40 -0400 Received: from terminus.zytor.com ([198.137.202.10]:33018 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751619AbcFPIci (ORCPT ); Thu, 16 Jun 2016 04:32:38 -0400 Date: Thu, 16 Jun 2016 01:32:07 -0700 From: tip-bot for Masami Hiramatsu Message-ID: Cc: ananth@linux.vnet.ibm.com, mingo@kernel.org, acme@redhat.com, hemant@linux.vnet.ibm.com, brendan.d.gregg@gmail.com, peterz@infradead.org, hpa@zytor.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, mhiramat@kernel.org, namhyung@kernel.org Reply-To: brendan.d.gregg@gmail.com, hemant@linux.vnet.ibm.com, peterz@infradead.org, hpa@zytor.com, ananth@linux.vnet.ibm.com, acme@redhat.com, mingo@kernel.org, namhyung@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, mhiramat@kernel.org In-Reply-To: <20160608092920.3116.63319.stgit@devbox> References: <20160608092920.3116.63319.stgit@devbox> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf probe: Fix to add NULL check for strndup Git-Commit-ID: 844faa4bcddc5d321311003ea3af9d808371c48e 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: 844faa4bcddc5d321311003ea3af9d808371c48e Gitweb: http://git.kernel.org/tip/844faa4bcddc5d321311003ea3af9d808371c48e Author: Masami Hiramatsu AuthorDate: Wed, 8 Jun 2016 18:29:21 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 14 Jun 2016 09:29:54 -0300 perf probe: Fix to add NULL check for strndup Fix to add a NULL check for strndup when parsing probe trace command. Signed-off-by: Masami Hiramatsu Cc: Ananth N Mavinakayanahalli Cc: Brendan Gregg Cc: Hemant Kumar Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/20160608092920.3116.63319.stgit@devbox Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/probe-event.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index 74401a2..7ae3dd1 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -1603,6 +1603,10 @@ int parse_probe_trace_command(const char *cmd, struct probe_trace_event *tev) p = strchr(argv[1], ':'); if (p) { tp->module = strndup(argv[1], p - argv[1]); + if (!tp->module) { + ret = -ENOMEM; + goto out; + } p++; } else p = argv[1];