Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d3dc5e8 authored by Stephane Eranian's avatar Stephane Eranian Committed by Arnaldo Carvalho de Melo
Browse files

perf symbols: Check return value of filename__read_debuglink() 



When dso__read_binary_type_filename() called, it doesn't check the
return value of filename__read_debuglink() so that it'll try to open the
debuglink file even if it doesn't exist.

Also fix return value of the filename__read_debuglink() as it always
return -1 regardless of the result.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Cody P Schafer <cody@linux.vnet.ibm.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1392859976-32760-3-git-send-email-namhyung@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 9e8c06ea

tools/perf/util/dso.c

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ int dso__read_binary_type_filename(const struct dso *dso, 
			debuglink--;

		if (*debuglink == '/')

			debuglink++;

		filename__read_debuglink(dso->long_name, debuglink,

		ret = filename__read_debuglink(dso->long_name, debuglink,

					       size - (debuglink - filename));

		}

		break;

tools/perf/util/symbol-elf.c

+2 −0
Original line number Diff line number Diff line
@@ -506,6 +506,8 @@ int filename__read_debuglink(const char *filename, char *debuglink, 
	/* the start of this section is a zero-terminated string */

	strncpy(debuglink, data->d_buf, size);



	err = 0;



out_elf_end:

	elf_end(elf);

out_close: