linux-kernel - Re: [PATCH] perf record: handle death by SIGTERM

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <51896A71.8010007@gmail.com>
Date:	Tue, 07 May 2013 14:56:17 -0600
From:	David Ahern <dsahern@...il.com>
To:	Ingo Molnar <mingo@...nel.org>,
	Stephane Eranian <eranian@...gle.com>
CC:	Arnaldo Carvalho de Melo <acme@...stprotocols.net>,
	LKML <linux-kernel@...r.kernel.org>,
	Mike Galbraith <efault@....de>,
	Frederic Weisbecker <fweisbec@...il.com>,
	Peter Zijlstra <peterz@...radead.org>,
	Jiri Olsa <jolsa@...hat.com>,
	Namhyung Kim <namhyung@...nel.org>
Subject: Re: [PATCH] perf record: handle death by SIGTERM

On 5/7/13 12:29 AM, Ingo Molnar wrote:
>
> * Stephane Eranian <eranian@...gle.com> wrote:
>
>> This is a good fix. I have run into this infinite loop in perf report
>> many times.
>
> Hm, perf record should really not assume much about the perf.data and
> should avoid infinite loops ...
>
> So while making perf.data more consistent on SIGTERM is a nice fix, perf
> report should be fixed as well to detect loops and such.
>
> Thanks,
>
> 	Ingo
>

This seems to do the trick:

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 326068a..e82646f 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -2802,6 +2802,17 @@ int perf_session__read_header(struct perf_session 
*session, int fd)
     if (perf_file_header__read(&f_header, header, fd) < 0)
         return -EINVAL;

+   /*
+    * sanity check that perf.data was written cleanly: data size
+    * is initialized to 0 and updated only if the on_exit function
+    * is run. If data size is still 0 then the file cannot be
+    * processed.
+    */
+   if (f_header.data.size == 0) {
+       pr_err("data size is 0. Was record properly terminated?\n");
+       return -1;
+   }
+
     nr_attrs = f_header.attrs.size / f_header.attr_size;
     lseek(fd, f_header.attrs.offset, SEEK_SET);

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/