tools/rv: Fix cleanup after failed trace setup

Currently if ikm_setup_trace_instance() fails, the tool returns without
any cleanup, if rv was called with both -t and -r, this means the
reactor is not going to be cleared.

Jump to the cleanup label to restore the reactor if necessary.

Fixes: 6d60f89691fc9 ("tools/rv: Add in-kernel monitor interface")
Reviewed-by: Nam Cao <namcao@linutronix.de>
Link: https://lore.kernel.org/r/20260514152055.229162-5-gmonaco@redhat.com
Signed-off-by: Gabriele Monaco <gmonaco@redhat.com>

diff --git a/tools/verification/rv/src/in_kernel.c b/tools/verification/rv/src/in_kernel.c
index e4f35940374f5ad4c5c73757fb6f30c5f9e8f5ec..e6dea4040f8f4c1af621387db73ecd67cf1b4c10 100644 (file)
--- a/tools/verification/rv/src/in_kernel.c
+++ b/tools/verification/rv/src/in_kernel.c
@@ -810,7 +810,7 @@ int ikm_run_monitor(char *monitor_name, int argc, char **argv)
        if (config_trace) {
                inst = ikm_setup_trace_instance(nested_name);
                if (!inst)
-                       return -1;
+                       goto out_free_instance;
        }
 
        retval = ikm_enable(full_name);