Skip to content
Snippets Groups Projects
Commit 5c6da487 authored by Dan Carpenter's avatar Dan Carpenter Committed by Frieder Schrempf
Browse files

rtla/osnoise: Prevent NULL dereference in error handling

commit 90574d2a upstream.

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: 1eceb2fc ("rtla/osnoise: Add osnoise top mode")
Link: https://lore.kernel.org/f964ed1f-64d2-4fde-ad3e-708331f8f358@stanley.mountain


Signed-off-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8d2360c2
No related branches found
No related tags found
1 merge request!166🤖 Sync Bot: Update v6.1-ktn to Latest Stable Kernel (v6.1.109)
...@@ -520,8 +520,10 @@ struct osnoise_tool *osnoise_init_top(struct osnoise_top_params *params) ...@@ -520,8 +520,10 @@ struct osnoise_tool *osnoise_init_top(struct osnoise_top_params *params)
return NULL; return NULL;
tool->data = osnoise_alloc_top(nr_cpus); tool->data = osnoise_alloc_top(nr_cpus);
if (!tool->data) if (!tool->data) {
goto out_err; osnoise_destroy_tool(tool);
return NULL;
}
tool->params = params; tool->params = params;
...@@ -529,11 +531,6 @@ struct osnoise_tool *osnoise_init_top(struct osnoise_top_params *params) ...@@ -529,11 +531,6 @@ struct osnoise_tool *osnoise_init_top(struct osnoise_top_params *params)
osnoise_top_handler, NULL); osnoise_top_handler, NULL);
return tool; return tool;
out_err:
osnoise_free_top(tool->data);
osnoise_destroy_tool(tool);
return NULL;
} }
static int stop_tracing; static int stop_tracing;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment