[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1258885784-11709-1-git-send-email-penberg@cs.helsinki.fi>
Date: Sun, 22 Nov 2009 12:29:44 +0200
From: Pekka Enberg <penberg@...helsinki.fi>
To: mingo@...e.hu
Cc: linux-kernel@...r.kernel.org,
Pekka Enberg <penberg@...helsinki.fi>,
Li Zefan <lizf@...fujitsu.com>,
Peter Zijlstra <peterz@...radead.org>,
Frederic Weisbecker <fweisbec@...il.com>,
Steven Rostedt <rostedt@...dmis.org>
Subject: [PATCH] perf kmem: Fix ELF header errors during "perf kmem record"
The write_event() function in builtin-record.c writes out all mmap()'d DSOs
including non-ELF files like GNOME resource files and such. Therefore, check
for ELF_K_ELF in filename__read_build_id() before attempting to read the ELF
header with gelf_getehdr().
Fixes the following error messages when running "perf kmem record":
penberg@...berg-laptop:~/src/linux/tools/perf$ perf kmem record
^C[ perf record: Woken up 2 times to write data ]
[ perf record: Captured and wrote 0.753 MB perf.data (~32885 samples) ]
filename__read_build_id: cannot get elf header.
filename__read_build_id: cannot get elf header.
filename__read_build_id: cannot get elf header.
filename__read_build_id: cannot get elf header.
filename__read_build_id: cannot get elf header.
filename__read_build_id: cannot get elf header.
filename__read_build_id: cannot get elf header.
filename__read_build_id: cannot get elf header.
filename__read_build_id: cannot get elf header.
Cc: Li Zefan <lizf@...fujitsu.com>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Frederic Weisbecker <fweisbec@...il.com>
Cc: Steven Rostedt <rostedt@...dmis.org>
Signed-off-by: Pekka Enberg <penberg@...helsinki.fi>
---
tools/perf/util/symbol.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 86ec6c7..f56158f 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -921,6 +921,7 @@ int filename__read_build_id(const char *filename, void *bf, size_t size)
GElf_Shdr shdr;
Elf_Data *data;
Elf_Scn *sec;
+ Elf_Kind ek;
void *ptr;
Elf *elf;
@@ -937,6 +938,10 @@ int filename__read_build_id(const char *filename, void *bf, size_t size)
goto out_close;
}
+ ek = elf_kind(elf);
+ if (ek != ELF_K_ELF)
+ goto out_elf_end;
+
if (gelf_getehdr(elf, &ehdr) == NULL) {
pr_err("%s: cannot get elf header.\n", __func__);
goto out_elf_end;
--
1.6.0.4
--
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/
Powered by blists - more mailing lists