From: Steven Rostedt <rostedt@goodmis.org>
To: linux-trace-devel@vger.kernel.org
Subject: [PATCH 3/3] trace-cmd: Check the return of get_file_content() before calling add_reset_file()
Date: Wed, 12 Jun 2019 14:19:30 -0400 [thread overview]
Message-ID: <20190612182019.169932649@goodmis.org> (raw)
In-Reply-To: 20190612181927.608151291@goodmis.org
From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
If get_file_content() returns NULL, because the file does not exist or for
any other reason, it will cause add_reset_file() to trigger a SEGSEGV due to
using a NULL pointer. Only call add_reset_file() if get_file_content()
actually returns something.
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
tracecmd/trace-record.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
index 2d716a81acbf..5dc6f17aa743 100644
--- a/tracecmd/trace-record.c
+++ b/tracecmd/trace-record.c
@@ -270,8 +270,10 @@ static void reset_save_file(const char *file, int prio)
char *content;
content = get_file_content(file);
- add_reset_file(file, content, prio);
- free(content);
+ if (content) {
+ add_reset_file(file, content, prio);
+ free(content);
+ }
}
/*
--
2.20.1
next prev parent reply other threads:[~2019-06-12 18:20 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-12 18:19 [PATCH 0/3] trace-cmd: Fix some bugs that include issues with --max-graph-depth Steven Rostedt
2019-06-12 18:19 ` [PATCH 1/3] trace-cmd: Fix typo in Makefile bidr to bdir Steven Rostedt
2019-06-13 14:40 ` Tzvetomir Stoyanov
2019-06-12 18:19 ` [PATCH 2/3] trace-cmd: Have --max-graph-depth only be part of instance Steven Rostedt
2019-06-13 14:48 ` Tzvetomir Stoyanov
2019-06-12 18:19 ` Steven Rostedt [this message]
2019-06-13 14:51 ` [PATCH 3/3] trace-cmd: Check the return of get_file_content() before calling add_reset_file() Tzvetomir Stoyanov
2019-06-13 14:51 ` [PATCH 0/3] trace-cmd: Fix some bugs that include issues with --max-graph-depth Slavomir Kaslev
2019-06-13 14:56 ` Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190612182019.169932649@goodmis.org \
--to=rostedt@goodmis.org \
--cc=linux-trace-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).