Commit 8ba29adf authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo

perf tools: Consolidate error path in __open_dso()

On failure, it should free the 'name', so clean up the error path using
goto.
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Suggested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Wang Nan <wangnan0@huawei.com>
Cc: kernel-team@lge.com
Link: http://lkml.kernel.org/r/20170608073109.30699-7-namhyung@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 1d6b3c9b
...@@ -454,7 +454,7 @@ static int do_open(char *name) ...@@ -454,7 +454,7 @@ static int do_open(char *name)
static int __open_dso(struct dso *dso, struct machine *machine) static int __open_dso(struct dso *dso, struct machine *machine)
{ {
int fd; int fd = -EINVAL;
char *root_dir = (char *)""; char *root_dir = (char *)"";
char *name = malloc(PATH_MAX); char *name = malloc(PATH_MAX);
...@@ -465,23 +465,19 @@ static int __open_dso(struct dso *dso, struct machine *machine) ...@@ -465,23 +465,19 @@ static int __open_dso(struct dso *dso, struct machine *machine)
root_dir = machine->root_dir; root_dir = machine->root_dir;
if (dso__read_binary_type_filename(dso, dso->binary_type, if (dso__read_binary_type_filename(dso, dso->binary_type,
root_dir, name, PATH_MAX)) { root_dir, name, PATH_MAX))
free(name); goto out;
return -EINVAL;
}
if (!is_regular_file(name)) { if (!is_regular_file(name))
free(name); goto out;
return -EINVAL;
}
if (dso__needs_decompress(dso)) { if (dso__needs_decompress(dso)) {
char newpath[KMOD_DECOMP_LEN]; char newpath[KMOD_DECOMP_LEN];
size_t len = sizeof(newpath); size_t len = sizeof(newpath);
if (dso__decompress_kmodule_path(dso, name, newpath, len) < 0) { if (dso__decompress_kmodule_path(dso, name, newpath, len) < 0) {
free(name); fd = -dso->load_errno;
return -dso->load_errno; goto out;
} }
strcpy(name, newpath); strcpy(name, newpath);
...@@ -492,6 +488,7 @@ static int __open_dso(struct dso *dso, struct machine *machine) ...@@ -492,6 +488,7 @@ static int __open_dso(struct dso *dso, struct machine *machine)
if (dso__needs_decompress(dso)) if (dso__needs_decompress(dso))
unlink(name); unlink(name);
out:
free(name); free(name);
return fd; return fd;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment