[for-linus][PATCH 2/2] rv: Fix missing unlock on double nested monitors return path

From: Steven Rostedt
Date: Wed Apr 02 2025 - 17:31:00 EST


From: Gabriele Monaco <gmonaco@xxxxxxxxxx>

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@xxxxxxxxxx>
Link: https://lore.kernel.org/20250402071351.19864-2-gmonaco@xxxxxxxxxx
Fixes: cb85c660fcd4 ("rv: Add option for nested monitors and include sched")
Reported-by: kernel test robot <lkp@xxxxxxxxx>
Reported-by: Julia Lawall <julia.lawall@xxxxxxxx>
Closes: https://lore.kernel.org/r/202503310200.UBXGitB4-lkp@xxxxxxxxx
Signed-off-by: Gabriele Monaco <gmonaco@xxxxxxxxxx>
Signed-off-by: Steven Rostedt (Google) <rostedt@xxxxxxxxxxx>
---
kernel/trace/rv/rv.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kernel/trace/rv/rv.c b/kernel/trace/rv/rv.c
index 50344aa9f7f9..968c5c3b0246 100644
--- a/kernel/trace/rv/rv.c
+++ b/kernel/trace/rv/rv.c
@@ -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);
--
2.47.2