From: Steven Rostedt <rostedt@goodmis.org>
To: linux-trace-devel@vger.kernel.org
Cc: "Steven Rostedt (Google)" <rostedt@goodmis.org>
Subject: [PATCH 1/2] trace-cmd library: Fail if tracecmd_init_data() fails
Date: Tue, 14 Jun 2022 22:54:35 -0400 [thread overview]
Message-ID: <20220615025436.568682-2-rostedt@goodmis.org> (raw)
In-Reply-To: <20220615025436.568682-1-rostedt@goodmis.org>
From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
If the initialization of tracecmd_init_data() fails, the processing will
continue and this can cause errors latter on that are unrelated to the
actual problem. Fail immediately instead.
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
lib/trace-cmd/trace-input.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c
index 11c0057589b6..c181c7d93be4 100644
--- a/lib/trace-cmd/trace-input.c
+++ b/lib/trace-cmd/trace-input.c
@@ -5382,12 +5382,14 @@ static int copy_trace_data_from_v6(struct tracecmd_input *in_handle,
static int copy_trace_data_from_v7(struct tracecmd_input *in_handle,
struct tracecmd_output *out_handle)
{
- int ret = 0;
+ int ret;
int i;
/* Force using temporary files for trace data decompression */
in_handle->read_zpage = false;
- tracecmd_init_data(in_handle);
+ ret = tracecmd_init_data(in_handle);
+ if (ret < 0)
+ return ret;
tracecmd_set_out_clock(out_handle, in_handle->trace_clock);
/* copy top buffer */
--
2.35.1
next prev parent reply other threads:[~2022-06-15 2:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-15 2:54 [PATCH 0/2] trace-cmd: Fix trace-cmd convert Steven Rostedt
2022-06-15 2:54 ` Steven Rostedt [this message]
2022-06-15 2:54 ` [PATCH 2/2] trace-cmd library: Fix reading of temp file used to decompress 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=20220615025436.568682-2-rostedt@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).