Commit-ID: 2ff5365d75e164032f64133914046fd6be213d94 Gitweb: http://git.kernel.org/tip/2ff5365d75e164032f64133914046fd6be213d94 Author: David Carrillo-Cisneros <davi...@google.com> AuthorDate: Mon, 17 Jul 2017 21:25:36 -0700 Committer: Arnaldo Carvalho de Melo <a...@redhat.com> 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 <davi...@google.com> Acked-by: David Ahern <dsah...@gmail.com> Acked-by: Jiri Olsa <jo...@kernel.org> Cc: Alexander Shishkin <alexander.shish...@linux.intel.com> Cc: Andi Kleen <a...@linux.intel.com> Cc: He Kuang <heku...@huawei.com> Cc: Masami Hiramatsu <mhira...@kernel.org> Cc: Namhyung Kim <namhy...@kernel.org> Cc: Paul Turner <p...@google.com> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Simon Que <s...@chromium.org> Cc: Stephane Eranian <eran...@google.com> Cc: Wang Nan <wangn...@huawei.com> Link: http://lkml.kernel.org/r/20170718042549.145161-4-davi...@google.com Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> --- 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; }
