@@ -845,9 +845,10 @@ static int read_event_files(struct tracecmd_input *handle, const char *regex)
static int read_proc_kallsyms(struct tracecmd_input *handle)
{
- struct tep_handle *pevent = handle->pevent;
+ struct tep_handle *tep = handle->pevent;
unsigned int size;
- char *buf;
+ char *buf = NULL;
+ int ret;
if (CHECK_READ_STATE(handle, TRACECMD_FILE_KALLSYMS))
return 0;
@@ -856,28 +857,31 @@ static int read_proc_kallsyms(struct tracecmd_input *handle)
add_section(handle, TRACECMD_OPTION_KALLSYMS, 0, 0,
lseek64(handle->fd, 0, SEEK_CUR));
-
- if (read4(handle, &size) < 0)
- return -1;
- if (!size)
- return 0; /* OK? */
+ ret = read4(handle, &size);
+ if (ret < 0)
+ goto out;
+ if (!size) {
+ handle->file_state = TRACECMD_FILE_KALLSYMS;
+ goto out; /* OK? */
+ }
buf = malloc(size+1);
- if (!buf)
- return -1;
- if (do_read_check(handle, buf, size)){
- free(buf);
- return -1;
+ if (!buf) {
+ ret = -1;
+ goto out;
}
- buf[size] = 0;
-
- tep_parse_kallsyms(pevent, buf);
+ ret = do_read_check(handle, buf, size);
+ if (ret < 0)
+ goto out;
- free(buf);
+ buf[size] = 0;
+ tep_parse_kallsyms(tep, buf);
handle->file_state = TRACECMD_FILE_KALLSYMS;
-
- return 0;
+ ret = 0;
+out:
+ free(buf);
+ return ret;
}
static int read_ftrace_printk(struct tracecmd_input *handle)
Some error paths in read_proc_kallsyms() may lead to a memory leak. Improved the error handling of this internal function to avoid it. Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com> --- lib/trace-cmd/trace-input.c | 40 ++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 18 deletions(-)