Messages in this thread Patch in this message | | | From | Adrian Hunter <> | Subject | [PATCH 5/5] perf tools: Fix data_read_offset() file opening | Date | Tue, 19 May 2015 16:05:46 +0300 |
| |
Patch "perf tools: Protect dso cache fd with a mutex" changed data_file_size() to open the data file if it was not open.
data_read_offset() was calling data_file_size() to read the data file size, but data_file_size() can fail to open the file because the binary_type has not been set up.
The correct function to call is dso__data_size() which uses dso__data_fd() to open the file correctly.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> --- tools/perf/util/dso.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index 1b96c8d..e248f56 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -756,7 +756,7 @@ off_t dso__data_size(struct dso *dso, struct machine *machine) static ssize_t data_read_offset(struct dso *dso, struct machine *machine, u64 offset, u8 *data, ssize_t size) { - if (data_file_size(dso, machine)) + if (dso__data_size(dso, machine) < 0) return -1; /* Check the offset sanity. */ -- 1.9.1
| |