diff options
| author | Dan Carpenter <dan.carpenter@linaro.org> | 2024-08-09 15:34:30 +0300 |
|---|---|---|
| committer | Steven Rostedt (Google) <rostedt@goodmis.org> | 2024-08-09 13:03:15 -0400 |
| commit | 90574d2a675947858b47008df8d07f75ea50d0d0 (patch) | |
| tree | bc32cacc7416513110fa9ff1848466d21a287b89 /tools | |
| parent | d0949cd44a62c4c41b30ea7ae94d8c887f586882 (diff) | |
| download | linux-stable-90574d2a675947858b47008df8d07f75ea50d0d0.tar.gz linux-stable-90574d2a675947858b47008df8d07f75ea50d0d0.tar.bz2 linux-stable-90574d2a675947858b47008df8d07f75ea50d0d0.zip | |
rtla/osnoise: Prevent NULL dereference in error handling
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.
Cc: stable@vger.kernel.org
Cc: John Kacur <jkacur@redhat.com>
Cc: "Luis Claudio R. Goncalves" <lgoncalv@redhat.com>
Cc: Clark Williams <williams@redhat.com>
Fixes: 1eceb2fc2ca5 ("rtla/osnoise: Add osnoise top mode")
Link: https://lore.kernel.org/f964ed1f-64d2-4fde-ad3e-708331f8f358@stanley.mountain
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/tracing/rtla/src/osnoise_top.c | 11 |
1 files 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; |