Skip to content

Commit 50987be

Browse files
committed
Merge tag 'trace-v5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fix from Steven Rostedt: "Fix a memory link in dyn_event_release(). An error path exited the function before freeing the allocated 'argv' variable" * tag 'trace-v5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: tracing/dynevent: Fix a memory leak in an error handling path
2 parents eebe426 + 8db403b commit 50987be

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

kernel/trace/trace_dynevent.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,10 @@ int dyn_event_release(const char *raw_command, struct dyn_event_operations *type
6363
event = p + 1;
6464
*p = '\0';
6565
}
66-
if (event[0] == '\0')
67-
return -EINVAL;
66+
if (event[0] == '\0') {
67+
ret = -EINVAL;
68+
goto out;
69+
}
6870

6971
mutex_lock(&event_mutex);
7072
for_each_dyn_event_safe(pos, n) {

0 commit comments

Comments
 (0)