From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755292AbbCXQd5 (ORCPT ); Tue, 24 Mar 2015 12:33:57 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56897 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932203AbbCXQdv (ORCPT ); Tue, 24 Mar 2015 12:33:51 -0400 Date: Tue, 24 Mar 2015 09:33:30 -0700 From: "tip-bot for Steven Rostedt (Red Hat)" Message-ID: Cc: tglx@linutronix.de, rostedt@goodmis.org, mingo@kernel.org, namhyung@kernel.org, acme@redhat.com, jolsa@redhat.com, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, hpa@zytor.com Reply-To: hpa@zytor.com, linux-kernel@vger.kernel.org, acme@redhat.com, jolsa@redhat.com, akpm@linux-foundation.org, namhyung@kernel.org, tglx@linutronix.de, mingo@kernel.org, rostedt@goodmis.org In-Reply-To: <20150324135922.695906738@goodmis.org> References: <20150324135922.695906738@goodmis.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools lib traceevent: Copy trace_clock and free it Git-Commit-ID: 99ad1417db2e83530b88e3eff1a40285d6ebfee9 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: 99ad1417db2e83530b88e3eff1a40285d6ebfee9 Gitweb: http://git.kernel.org/tip/99ad1417db2e83530b88e3eff1a40285d6ebfee9 Author: Steven Rostedt (Red Hat) AuthorDate: Tue, 24 Mar 2015 09:57:50 -0400 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 24 Mar 2015 12:11:19 -0300 tools lib traceevent: Copy trace_clock and free it The pevent->trace_clock should not be a direct pointer to what was given. It should be copied and freed. Note, valgrind pointed this out when a caller passed in a pointer that needed to be freed and it never was. Ideally, pevent should copy it (which this change does), and free the copy. It's up to the caller to free the clock string passed in. Signed-off-by: Steven Rostedt Cc: Andrew Morton Cc: Jiri Olsa Cc: Namhyung Kim Link: http://lkml.kernel.org/r/20150324135922.695906738@goodmis.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/lib/traceevent/event-parse.c | 10 ++++++++-- tools/lib/traceevent/event-parse.h | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c index 31d4e7d..e71c472 100644 --- a/tools/lib/traceevent/event-parse.c +++ b/tools/lib/traceevent/event-parse.c @@ -321,9 +321,14 @@ int pevent_register_comm(struct pevent *pevent, const char *comm, int pid) return 0; } -void pevent_register_trace_clock(struct pevent *pevent, char *trace_clock) +int pevent_register_trace_clock(struct pevent *pevent, const char *trace_clock) { - pevent->trace_clock = trace_clock; + pevent->trace_clock = strdup(trace_clock); + if (!pevent->trace_clock) { + errno = ENOMEM; + return -1; + } + return 0; } struct func_map { @@ -6352,6 +6357,7 @@ void pevent_free(struct pevent *pevent) free_handler(handle); } + free(pevent->trace_clock); free(pevent->events); free(pevent->sort_events); diff --git a/tools/lib/traceevent/event-parse.h b/tools/lib/traceevent/event-parse.h index 6abda54..84e554f 100644 --- a/tools/lib/traceevent/event-parse.h +++ b/tools/lib/traceevent/event-parse.h @@ -599,7 +599,7 @@ enum trace_flag_type { }; int pevent_register_comm(struct pevent *pevent, const char *comm, int pid); -void pevent_register_trace_clock(struct pevent *pevent, char *trace_clock); +int pevent_register_trace_clock(struct pevent *pevent, const char *trace_clock); int pevent_register_function(struct pevent *pevent, char *name, unsigned long long addr, char *mod); int pevent_register_print_string(struct pevent *pevent, const char *fmt,