From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754508AbdGNPIc (ORCPT ); Fri, 14 Jul 2017 11:08:32 -0400 Received: from mail.efficios.com ([167.114.142.141]:33811 "EHLO mail.efficios.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754192AbdGNPI2 (ORCPT ); Fri, 14 Jul 2017 11:08:28 -0400 From: Francis Deslauriers To: rostedt@goodmis.org, mhiramat@kernel.org, peterz@infradead.org Cc: mathieu.desnoyers@efficios.com, linux-kernel@vger.kernel.org, Francis Deslauriers Subject: [PATCH 2/2] kprobe: fix: Add ftrace_ops_assist_func to kprobe blacklist Date: Fri, 14 Jul 2017 10:58:35 -0400 Message-Id: <1500044315-9508-3-git-send-email-francis.deslauriers@efficios.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1500044315-9508-1-git-send-email-francis.deslauriers@efficios.com> References: <1500044315-9508-1-git-send-email-francis.deslauriers@efficios.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This function is called when a kprobe is hit. Thus it should be blacklisted to prevent kprobe to be triggered by kprobes. Signed-off-by: Francis Deslauriers --- kernel/trace/ftrace.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index b308be3..c473d9b 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -36,6 +36,7 @@ #include +#include #include #include @@ -5739,6 +5740,7 @@ static void ftrace_ops_assist_func(unsigned long ip, unsigned long parent_ip, preempt_enable_notrace(); trace_clear_recursion(bit); } +NOKPROBE_SYMBOL(ftrace_ops_assist_func); /** * ftrace_ops_get_func - get the function a trampoline should call -- 2.7.4