Skip to contentSkip to conversation

fgraph: Make sure fregs is non-null when accessing

PATCH NAK [email protected] 2 participants 2 messages Jan 7

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fgraph: Make sure fregs is non-null when accessing

From: sunliming <[email protected]>

Fix below smatch warnings:
kernel/trace/fgraph.c:834 __ftrace_return_to_handler() error: we previously assumed 'fregs' could be null (see line 830)

---
 kernel/trace/fgraph.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/trace/fgraph.c +2 -1
index cc48d16be43e..0f50a55032c5 100644
@@ -837,7 +837,8 @@ __ftrace_return_to_handler(struct ftrace_regs *fregs, unsigned long frame_pointe
 		goto out;
 
 #ifdef CONFIG_FUNCTION_GRAPH_RETVAL
-	trace.retval = ftrace_regs_get_return_value(fregs);
+	if (fregs)
+		trace.retval = ftrace_regs_get_return_value(fregs);
 #endif
 
 	bitmap = get_bitmap_bits(current, offset);
Signature · 1 line
2.25.1
maintainer NAK
#1 lore raw
Quoted 6 lines · On Wed, 7 Jan 2026 09:51:25 +0800 [email protected] wrote:

From: sunliming <[email protected]>

Fix below smatch warnings:
kernel/trace/fgraph.c:834 __ftrace_return_to_handler() error: we previously assumed 'fregs' could be null (see line 830)

NACK!

Quoted 3 lines

Really? Did you not read this thread you are "closing"?

-- Steve

Quoted 19 lines
---
 kernel/trace/fgraph.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/trace/fgraph.c +2 -1
index cc48d16be43e..0f50a55032c5 100644
@@ -837,7 +837,8 @@ __ftrace_return_to_handler(struct ftrace_regs *fregs, unsigned long frame_pointe
 		goto out;
 
 #ifdef CONFIG_FUNCTION_GRAPH_RETVAL
-	trace.retval = ftrace_regs_get_return_value(fregs);
+	if (fregs)
+		trace.retval = ftrace_regs_get_return_value(fregs);
 #endif
 
 	bitmap = get_bitmap_bits(current, offset);