From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935591AbdGTJDw (ORCPT ); Thu, 20 Jul 2017 05:03:52 -0400 Received: from terminus.zytor.com ([65.50.211.136]:47255 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933993AbdGTJDs (ORCPT ); Thu, 20 Jul 2017 05:03:48 -0400 Date: Thu, 20 Jul 2017 01:59:07 -0700 From: tip-bot for David Carrillo-Cisneros Message-ID: Cc: ak@linux.intel.com, alexander.shishkin@linux.intel.com, sque@chromium.org, mhiramat@kernel.org, peterz@infradead.org, davidcc@google.com, acme@redhat.com, mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, dsahern@gmail.com, pjt@google.com, eranian@google.com, namhyung@kernel.org, hekuang@huawei.com, hpa@zytor.com, wangnan0@huawei.com, jolsa@kernel.org Reply-To: wangnan0@huawei.com, jolsa@kernel.org, hpa@zytor.com, hekuang@huawei.com, namhyung@kernel.org, eranian@google.com, pjt@google.com, dsahern@gmail.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@kernel.org, acme@redhat.com, davidcc@google.com, peterz@infradead.org, mhiramat@kernel.org, sque@chromium.org, ak@linux.intel.com, alexander.shishkin@linux.intel.com In-Reply-To: <20170718042549.145161-4-davidcc@google.com> References: <20170718042549.145161-4-davidcc@google.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf header: Fail on write_padded error Git-Commit-ID: 2ff5365d75e164032f64133914046fd6be213d94 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: 2ff5365d75e164032f64133914046fd6be213d94 Gitweb: http://git.kernel.org/tip/2ff5365d75e164032f64133914046fd6be213d94 Author: David Carrillo-Cisneros AuthorDate: Mon, 17 Jul 2017 21:25:36 -0700 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 18 Jul 2017 23:14:29 -0300 perf header: Fail on write_padded error Do not proceed if write_padded() error failed. Also, add comments to remind that the return value of write_* functions in util/header.c is an errno code and not the number of bytes written. Signed-off-by: David Carrillo-Cisneros Acked-by: David Ahern Acked-by: Jiri Olsa Cc: Alexander Shishkin Cc: Andi Kleen Cc: He Kuang Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Paul Turner Cc: Peter Zijlstra Cc: Simon Que Cc: Stephane Eranian Cc: Wang Nan Link: http://lkml.kernel.org/r/20170718042549.145161-4-davidcc@google.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/header.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 3b833f0..8dda19b 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -74,6 +74,7 @@ bool perf_header__has_feat(const struct perf_header *header, int feat) return test_bit(feat, header->adds_features); } +/* Return: 0 if succeded, -ERR if failed. */ static int do_write(int fd, const void *buf, size_t size) { while (size) { @@ -89,6 +90,7 @@ static int do_write(int fd, const void *buf, size_t size) return 0; } +/* Return: 0 if succeded, -ERR if failed. */ int write_padded(int fd, const void *bf, size_t count, size_t count_aligned) { static const char zero_buf[NAME_ALIGN]; @@ -103,6 +105,7 @@ int write_padded(int fd, const void *bf, size_t count, size_t count_aligned) #define string_size(str) \ (PERF_ALIGN((strlen(str) + 1), NAME_ALIGN) + sizeof(u32)) +/* Return: 0 if succeded, -ERR if failed. */ static int do_write_string(int fd, const char *str) { u32 len, olen; @@ -3200,7 +3203,8 @@ int perf_event__synthesize_tracing_data(struct perf_tool *tool, int fd, */ tracing_data_put(tdata); - write_padded(fd, NULL, 0, padding); + if (write_padded(fd, NULL, 0, padding)) + return -1; return aligned_size; }