Skip to contentSkip to conversation

Patch "ftrace: Fix selftest goto location on error" has been added to the 4.13-stable tree

PATCH [email protected] 1 participant 1 message Sep 22, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ftrace: Fix selftest goto location on error

to the 4.13-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
ftrace-fix-selftest-goto-location-on-error.patch
and it can be found in the queue-4.13 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 46320a6acc4fb58f04bcf78c4c942cc43b20f986 Mon Sep 17 00:00:00 2001

From: "Steven Rostedt (VMware)" <[email protected]>
Date: Fri, 1 Sep 2017 12:04:09 -0400
Subject: ftrace: Fix selftest goto location on error

From: Steven Rostedt (VMware) <[email protected]>

commit 46320a6acc4fb58f04bcf78c4c942cc43b20f986 upstream.

In the second iteration of trace_selftest_ops(), the error goto label is wrong in the case where trace_selftest_test_global_cnt is off. In the case of error, it leaks the dynamic ops that was allocated.

Fixes 95950c2e ("ftrace: Add self-tests for multiple function trace users")
---
 kernel/trace/trace_selftest.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/trace_selftest.c +1 -1
@@ -273,7 +273,7 @@ static int trace_selftest_ops(struct tra
 		goto out_free;
 	if (cnt > 1) {
 		if (trace_selftest_test_global_cnt == 0)
-			goto out;
+			goto out_free;
 	}
 	if (trace_selftest_test_dyn_cnt == 0)
 		goto out_free;

Patches currently in stable-queue which might be from [email protected] are

queue-4.13/ftrace-fix-debug-preempt-config-name-in-stack_tracer_-en-dis-able.patch queue-4.13/tracing-add-barrier-to-trace_printk-buffer-nesting-modification.patch queue-4.13/ftrace-fix-memleak-when-unregistering-dynamic-ops-when-tracing-disabled.patch queue-4.13/tracing-apply-trace_clock-changes-to-instance-max-buffer.patch queue-4.13/ftrace-fix-selftest-goto-location-on-error.patch queue-4.13/tracing-fix-clear-of-recorded_tgid-flag-when-disabling-trace-event.patch