From: Dan Carpenter <dan.carpenter@linaro.org>
To: Daniel Bristot de Oliveira <bristot@kernel.org>
Cc: Steven Rostedt <rostedt@goodmis.org>,
John Kacur <jkacur@redhat.com>,
"Luis Claudio R. Goncalves" <lgoncalv@redhat.com>,
Clark Williams <williams@redhat.com>,
linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: [PATCH] rtla/osnoise: prevent NULL dereference in error handling
Date: Fri, 9 Aug 2024 15:34:30 +0300 [thread overview]
Message-ID: <f964ed1f-64d2-4fde-ad3e-708331f8f358@stanley.mountain> (raw)
If the "tool->data" allocation fails then there is no need to call
osnoise_free_top() and, in fact, doing so will lead to a NULL dereference.
Fixes: 1eceb2fc2ca5 ("rtla/osnoise: Add osnoise top mode")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
tools/tracing/rtla/src/osnoise_top.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/tools/tracing/rtla/src/osnoise_top.c b/tools/tracing/rtla/src/osnoise_top.c
index f594a44df840..2f756628613d 100644
--- a/tools/tracing/rtla/src/osnoise_top.c
+++ b/tools/tracing/rtla/src/osnoise_top.c
@@ -651,8 +651,10 @@ struct osnoise_tool *osnoise_init_top(struct osnoise_top_params *params)
return NULL;
tool->data = osnoise_alloc_top(nr_cpus);
- if (!tool->data)
- goto out_err;
+ if (!tool->data) {
+ osnoise_destroy_tool(tool);
+ return NULL;
+ }
tool->params = params;
@@ -660,11 +662,6 @@ struct osnoise_tool *osnoise_init_top(struct osnoise_top_params *params)
osnoise_top_handler, NULL);
return tool;
-
-out_err:
- osnoise_free_top(tool->data);
- osnoise_destroy_tool(tool);
- return NULL;
}
static int stop_tracing;
--
2.43.0
next reply other threads:[~2024-08-09 12:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-09 12:34 Dan Carpenter [this message]
2024-08-09 17:34 ` [PATCH] rtla/osnoise: prevent NULL dereference in error handling John Kacur
2024-08-09 17:41 ` Steven Rostedt
2024-08-09 17:53 ` John Kacur
2024-08-09 18:05 ` Steven Rostedt
2024-08-09 18:42 ` John Kacur
2024-08-12 12:45 ` Luis Claudio R. Goncalves
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=f964ed1f-64d2-4fde-ad3e-708331f8f358@stanley.mountain \
--to=dan.carpenter@linaro.org \
--cc=bristot@kernel.org \
--cc=jkacur@redhat.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=lgoncalv@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=rostedt@goodmis.org \
--cc=williams@redhat.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