rtla/osnoise: Prevent NULL dereference in error handling

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: 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/tools/tracing/rtla/src/osnoise_top.c b/tools/tracing/rtla/src/osnoise_top.c
index 07ba55d4ec06f0d7c03bb6cda7b23e2fe9d8eb21..de33ea5005b6bb516e15df78acf1078a12eaf701 100644 (file)
--- a/tools/tracing/rtla/src/osnoise_top.c
+++ b/tools/tracing/rtla/src/osnoise_top.c
@@ -640,8 +640,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;
 
@@ -649,11 +651,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;