mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-15 08:14:15 +08:00
rtla/osnoise: Prevent NULL dereference in error handling
commit90574d2a67
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:
parent
67d1d8cc59
commit
753f174514
@ -624,8 +624,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;
|
||||
|
||||
@ -633,11 +635,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;
|
||||
|
Loading…
Reference in New Issue
Block a user