From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751965AbcF0NzD (ORCPT ); Mon, 27 Jun 2016 09:55:03 -0400 Received: from mx2.suse.de ([195.135.220.15]:48290 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751906AbcF0Ny6 (ORCPT ); Mon, 27 Jun 2016 09:54:58 -0400 From: Petr Mladek To: Steven Rostedt , Ingo Molnar Cc: Frederic Weisbecker , Masami Hiramatsu , Jiri Kosina , linux-kernel@vger.kernel.org, x86@kernel.org, Petr Mladek Subject: [PATCH 4/4] ftrace: Fixup trace_selftest_ops() Date: Mon, 27 Jun 2016 15:54:37 +0200 Message-Id: <1467035677-12193-5-git-send-email-pmladek@suse.com> X-Mailer: git-send-email 1.8.5.6 In-Reply-To: <1467035677-12193-1-git-send-email-pmladek@suse.com> References: <1467035677-12193-1-git-send-email-pmladek@suse.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org I was hunting a memory leak related to trace_selftest_ops() and found two small mistakes there. First, the dynamic trace must be freed in case of error. There was one wrong goto target. It was even in the original commit 95950c2ecb31314ef ("ftrace: Add self-tests for multiple function trace users"). Second, ftrace_init_array_ops() is called only when cnt > 1 but but ftrace_reset_array_ops() is always called. It probably does not harm but it is strange and might eventually hide a bug. This was added by the commit 4104d326b670c2 ("ftrace: Remove global function list and call function directly"). Signed-off-by: Petr Mladek --- kernel/trace/trace_selftest.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c index b0f86ea77881..0b5ae79b5b0c 100644 --- a/kernel/trace/trace_selftest.c +++ b/kernel/trace/trace_selftest.c @@ -272,7 +272,7 @@ static int trace_selftest_ops(struct trace_array *tr, int cnt) 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; @@ -298,9 +298,10 @@ static int trace_selftest_ops(struct trace_array *tr, int cnt) unregister_ftrace_function(&test_probe1); unregister_ftrace_function(&test_probe2); unregister_ftrace_function(&test_probe3); - if (cnt > 1) + if (cnt > 1) { unregister_ftrace_function(tr->ops); - ftrace_reset_array_ops(tr); + ftrace_reset_array_ops(tr); + } /* Make sure everything is off */ reset_counts(); -- 1.8.5.6