Commit 1388d715 authored Jun 19, 2012 by Jiri Olsa Committed by Arnaldo Carvalho de Melo Jun 29, 2012

perf symbols: Add '.note' check into search for NOTE section

Adding '.note' section name to be check when looking for notes section.
The '.note' name is used by kernel VDSO.

Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Arun Sharma <asharma@fb.com>
Cc: Benjamin Redelings <benjamin.redelings@nescent.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: Frank Ch. Eigler <fche@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Robert Richter <robert.richter@amd.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
Cc: Ulrich Drepper <drepper@gmail.com>
Link: http://lkml.kernel.org/r/1340120894-9465-15-git-send-email-jolsa@redhat.com

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 9bc8f9fe

tools/perf/util/symbol.c

+23 −6

Original line number	Diff line number	Diff line
		@@ -1478,14 +1478,31 @@ static int elf_read_build_id(Elf elf, void bf, size_t size)
		goto out;
		}

		/*
		* Check following sections for notes:
		* '.note.gnu.build-id'
		* '.notes'
		* '.note' (VDSO specific)
		*/
		do {
		sec = elf_section_by_name(elf, &ehdr, &shdr,
		".note.gnu.build-id", NULL);
		if (sec == NULL) {
		if (sec)
		break;

		sec = elf_section_by_name(elf, &ehdr, &shdr,
		".notes", NULL);
		if (sec == NULL)
		goto out;
		}
		if (sec)
		break;

		sec = elf_section_by_name(elf, &ehdr, &shdr,
		".note", NULL);
		if (sec)
		break;

		return err;

		} while (0);

		data = elf_getdata(sec, NULL);
		if (data == NULL)