]> www.infradead.org Git - nvme.git/commitdiff
rv: Fix missing unlock on double nested monitors return path
authorGabriele Monaco <gmonaco@redhat.com>
Wed, 2 Apr 2025 07:13:52 +0000 (09:13 +0200)
committerSteven Rostedt (Google) <rostedt@goodmis.org>
Wed, 2 Apr 2025 13:51:26 +0000 (09:51 -0400)
RV doesn't support nested monitors having children monitors themselves
and exits with the EINVAL code. However, it returns without unlocking
the rv_interface_lock.

Unlock the lock before returning from the initialisation function.

Cc: Masami Hiramatsu <mhiramat@kernel.org>
Link: https://lore.kernel.org/20250402071351.19864-2-gmonaco@redhat.com
Fixes: cb85c660fcd4 ("rv: Add option for nested monitors and include sched")
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Julia Lawall <julia.lawall@inria.fr>
Closes: https://lore.kernel.org/r/202503310200.UBXGitB4-lkp@intel.com
Signed-off-by: Gabriele Monaco <gmonaco@redhat.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
kernel/trace/rv/rv.c

index 50344aa9f7f93748a9a37c1b89f6419c66f2b7d8..968c5c3b02464f3239a310c73bc14af643cd8497 100644 (file)
@@ -809,7 +809,8 @@ int rv_register_monitor(struct rv_monitor *monitor, struct rv_monitor *parent)
        if (p && rv_is_nested_monitor(p)) {
                pr_info("Parent monitor %s is already nested, cannot nest further\n",
                        parent->name);
-               return -EINVAL;
+               retval = -EINVAL;
+               goto out_unlock;
        }
 
        r = kzalloc(sizeof(struct rv_monitor_def), GFP_KERNEL);