From: Steven Rostedt <rostedt@goodmis.org>
To: linux-trace-devel@vger.kernel.org
Cc: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
Subject: [PATCH 7/8] trace-cmd input: Validate the input handle when copying from it
Date: Mon, 01 Mar 2021 09:37:31 -0500 [thread overview]
Message-ID: <20210301143857.694136727@goodmis.org> (raw)
In-Reply-To: 20210301143724.540985351@goodmis.org
From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
Now that there's validation states, make sure that the input handle is at
the correct state to validate it.
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
lib/trace-cmd/trace-input.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c
index 9a4b1f4e118a..53c2722f46e7 100644
--- a/lib/trace-cmd/trace-input.c
+++ b/lib/trace-cmd/trace-input.c
@@ -3491,6 +3491,10 @@ static int copy_header_files(struct tracecmd_input *handle, int fd)
{
unsigned long long size;
+ /* The input handle has to have at least read the headers */
+ if (handle->file_state < TRACECMD_FILE_HEADERS)
+ return -1;
+
lseek64(handle->fd, handle->header_files_start, SEEK_SET);
/* "header_page" */
@@ -3522,6 +3526,10 @@ static int copy_ftrace_files(struct tracecmd_input *handle, int fd)
unsigned int count;
unsigned int i;
+ /* The input handle has to have at least read the ftrace events */
+ if (handle->file_state < TRACECMD_FILE_FTRACE_EVENTS)
+ return -1;
+
if (read_copy_size4(handle, fd, &count) < 0)
return -1;
@@ -3545,6 +3553,10 @@ static int copy_event_files(struct tracecmd_input *handle, int fd)
unsigned int count;
unsigned int i,x;
+ /* The input handle has to have at least read all its events */
+ if (handle->file_state < TRACECMD_FILE_ALL_EVENTS)
+ return -1;
+
if (read_copy_size4(handle, fd, &systems) < 0)
return -1;
@@ -3577,6 +3589,10 @@ static int copy_proc_kallsyms(struct tracecmd_input *handle, int fd)
{
unsigned int size;
+ /* The input handle has to have at least has kallsyms */
+ if (handle->file_state < TRACECMD_FILE_KALLSYMS)
+ return -1;
+
if (read_copy_size4(handle, fd, &size) < 0)
return -1;
if (!size)
@@ -3592,6 +3608,10 @@ static int copy_ftrace_printk(struct tracecmd_input *handle, int fd)
{
unsigned int size;
+ /* The input handle has to have at least has printk stored */
+ if (handle->file_state < TRACECMD_FILE_PRINTK)
+ return -1;
+
if (read_copy_size4(handle, fd, &size) < 0)
return -1;
if (!size)
@@ -3607,6 +3627,10 @@ static int copy_command_lines(struct tracecmd_input *handle, int fd)
{
unsigned long long size;
+ /* The input handle has to have at least read the cmdlines */
+ if (handle->file_state < TRACECMD_FILE_CMD_LINES)
+ return -1;
+
if (read_copy_size8(handle, fd, &size) < 0)
return -1;
if (!size)
--
2.30.0
next prev parent reply other threads:[~2021-03-01 14:40 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-01 14:37 [PATCH 0/8] trace-cmd: Fixes for trace-cmd restore Steven Rostedt
2021-03-01 14:37 ` [PATCH 1/8] trace-cmd restore: Fix to add saved cmdlines after calling tracecmd_create_init_file_override() Steven Rostedt
2021-03-01 14:37 ` [PATCH 2/8] trace-cmd: Create API tracecmd_read_pre_headers() Steven Rostedt
2021-03-02 4:49 ` Tzvetomir Stoyanov
2021-03-02 14:13 ` Steven Rostedt
2021-03-01 14:37 ` [PATCH 3/8] trace-cmd: Move tracecmd_write_cmdlines() out of tracecmd_append_cpu_data() Steven Rostedt
2021-03-01 14:37 ` [PATCH 4/8] trace-cmd: Move the output state updates into the functions that change the state Steven Rostedt
2021-03-01 14:37 ` [PATCH 5/8] trace-cmd: Move the input " Steven Rostedt
2021-03-01 14:37 ` [PATCH 6/8] trace-cmd output: Set file_state of output handle after copy of headers Steven Rostedt
2021-03-02 8:10 ` Tzvetomir Stoyanov
2021-03-02 14:19 ` Steven Rostedt
2021-03-02 14:51 ` Tzvetomir Stoyanov
2021-03-02 15:48 ` Steven Rostedt
2021-03-02 17:35 ` Tzvetomir Stoyanov
2021-03-02 19:59 ` Steven Rostedt
2021-03-02 14:22 ` Steven Rostedt
2021-03-01 14:37 ` Steven Rostedt [this message]
2021-03-01 14:37 ` [PATCH 8/8] trace-cmd input: Add validation updates to the copy of a handle 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=20210301143857.694136727@goodmis.org \
--to=rostedt@goodmis.org \
--cc=linux-trace-devel@vger.kernel.org \
--cc=tz.stoyanov@gmail.com \
/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).