diff options
author | Pierre Habouzit <pierre.habouzit@intersec.com> | 2009-08-07 14:16:00 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-08-09 12:54:39 +0200 |
commit | 7eac7e9e726c1b136bd7e0ad6671ce315f48bb18 (patch) | |
tree | 17762cc0b140096e80e6ff509cc423f8e62db7e6 | |
parent | ae07b63f4b6728e1f98aa5c5416cfc1280f59f51 (diff) | |
download | op-kernel-dev-7eac7e9e726c1b136bd7e0ad6671ce315f48bb18.zip op-kernel-dev-7eac7e9e726c1b136bd7e0ad6671ce315f48bb18.tar.gz |
perf util: Fix do_read() to fail on EOF instead of busy-looping
While toying with perf, I've noticed that perf record can
easily enter a busy loop when doing something as silly as:
$ perf record -A ls
Yeah, do_read here really wants to read a known size, not being
able to should die(), not busy-loop ;)
That was the cause for the bug.
Signed-off-by: Pierre Habouzit <pierre.habouzit@intersec.com>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | tools/perf/util/header.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 95a44bc..b92a457 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -185,6 +185,8 @@ static void do_read(int fd, void *buf, size_t size) if (ret < 0) die("failed to read"); + if (ret == 0) + die("failed to read: missing data"); size -= ret; buf += ret; |