Received-SPF: pass (google.com: domain of linux-kernel+bounces-215891-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Date: Sat, 15 Jun 2024 09:10:01 -0400
From: Steven Rostedt <rostedt@goodmis.org>
To: LKML <linux-kernel@vger.kernel.org>, Mark Rutland
 <mark.rutland@arm.com>, Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
 Naresh Kamboju <naresh.kamboju@linaro.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Subject: [for-next][PATCH] function_graph: Add READ_ONCE() when accessing
 fgraph_array[]
Message-ID: <20240615091001.04a33174@rorschach.local.home>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit


  git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
ftrace/for-next

Head SHA1: 63a8dfb889112ab4a065aa60a9a1b590b410d055


Steven Rostedt (Google) (1):
      function_graph: Add READ_ONCE() when accessing fgraph_array[]

----
 kernel/trace/fgraph.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---------------------------
commit 63a8dfb889112ab4a065aa60a9a1b590b410d055
Author: Steven Rostedt (Google) <rostedt@goodmis.org>
Date:   Thu Jun 13 09:52:23 2024 -0400

    function_graph: Add READ_ONCE() when accessing fgraph_array[]
    
    In function_graph_enter() there's a loop that looks at fgraph_array[]
    elements which are fgraph_ops. It first tests if it is a fgraph_stub op,
    and if so skips it, as that's just there as a place holder. Then it checks
    the fgraph_ops filters to see if the ops wants to trace the current
    function.
    
    But if the compiler reloads the fgraph_array[] after the check against
    fgraph_stub, it could race with the fgraph_array[] being updated with the
    fgraph_stub. That would cause the stub to be processed. But the stub has a
    null "func_hash" field which will cause a NULL pointer dereference.
    
    Add a READ_ONCE() so that the gops that is compared against the
    fgraph_stub is also the gops that is processed later.
    
    Link: https://lore.kernel.org/all/CA+G9fYsSVJQZH=nM=1cjTc94PgSnMF9y65BnOv6XSoCG_b6wmw@mail.gmail.com/
    Link: https://lore.kernel.org/linux-trace-kernel/20240613095223.1f07e3a4@rorschach.local.home
    
    Cc: Mark Rutland <mark.rutland@arm.com>
    Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
    Fixes: cc60ee813b503 ("function_graph: Use static_call and branch to optimize entry function")
    Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
    Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
    Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>

diff --git a/kernel/trace/fgraph.c b/kernel/trace/fgraph.c
index 8317d1a7f43a..fc205ad167a9 100644
--- a/kernel/trace/fgraph.c
+++ b/kernel/trace/fgraph.c
@@ -641,7 +641,7 @@ int function_graph_enter(unsigned long ret, unsigned long func,
 	{
 		for_each_set_bit(i, &fgraph_array_bitmask,
 					 sizeof(fgraph_array_bitmask) * BITS_PER_BYTE) {
-			struct fgraph_ops *gops = fgraph_array[i];
+			struct fgraph_ops *gops = READ_ONCE(fgraph_array[i]);
 			int save_curr_ret_stack;
 
 			if (gops == &fgraph_stub)