bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtla/osnoise: Prevent NULL dereference in error handling

Browse source 
commit 90574d2a675947858b47008df8d07f75ea50d0d0 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: 1eceb2fc2c ("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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dan Carpenter 2024-08-09 15:34:30 +03:00 • committed by Greg Kroah-Hartman
parent 67d1d8cc59
commit 753f174514
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tools/tracing/rtla/src/osnoise_top.c
View file

@ -624,8 +624,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;
@ -633,11 +635,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;