Skip to contentSkip to conversation

function_graph: Add READ_ONCE() when accessing fgraph_array[]

PATCH New Steven Rostedt 1 participant 1 message Jun 15, 2024

Subsystems (2)
lore
Share & tools
lore

Steven Rostedt

author maintainer
#0 lore raw

PATCH 1/1 function_graph: Add READ_ONCE() when accessing fgraph_array[]

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) <[email protected]>
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.

Cc Mark Rutland <[email protected]>
Cc Mathieu Desnoyers <[email protected]>
Fixes cc60ee813b503 ("function_graph: Use static_call and branch to optimize entry function")
kernel/trace/fgraph.c +1 -1
index 8317d1a7f43a..fc205ad167a9 100644
@@ -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)