Skip to contentSkip to conversation

kprobes: Remove unnecessary ‘NULL’ values from correct_ret_addr

PATCH In review Li zeming 2 participants 2 messages Jul 3, 2023 – Jul 6, 2023

Subsystems (2)
lore
Share & tools
lore

Li zeming

author
#0 lore raw

PATCH 1/1 kprobes: Remove unnecessary ‘NULL’ values from correct_ret_addr

The 'correct_ret_addr' pointer is always set in the later code, no need to initialize it at definition time.

---
 kernel/kprobes.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/kprobes.c +1 -1
index db8a3aa53cf6..ec50f9f380c1 100644
@@ -2007,9 +2007,9 @@ void __weak arch_kretprobe_fixup_return(struct pt_regs *regs,
 unsigned long __kretprobe_trampoline_handler(struct pt_regs *regs,
 					     void *frame_pointer)
 {
-	kprobe_opcode_t *correct_ret_addr = NULL;
 	struct kretprobe_instance *ri = NULL;
 	struct llist_node *first, *node = NULL;
+	kprobe_opcode_t *correct_ret_addr;
 	struct kretprobe *rp;
 
 	/* Find correct address and all nodes for this frame. */
Signature · 1 line
2.18.2
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 2 lines · On Wed, 5 Jul 2023 03:43:59 +0800 Li zeming <[email protected]> wrote:

The 'correct_ret_addr' pointer is always set in the later code, no need to initialize it at definition time.

Indeed. Thanks!

Quoted 24 lines
---
 kernel/kprobes.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/kprobes.c +1 -1
index db8a3aa53cf6..ec50f9f380c1 100644
@@ -2007,9 +2007,9 @@ void __weak arch_kretprobe_fixup_return(struct pt_regs *regs,
 unsigned long __kretprobe_trampoline_handler(struct pt_regs *regs,
 					     void *frame_pointer)
 {
-	kprobe_opcode_t *correct_ret_addr = NULL;
 	struct kretprobe_instance *ri = NULL;
 	struct llist_node *first, *node = NULL;
+	kprobe_opcode_t *correct_ret_addr;
 	struct kretprobe *rp;
 
 	/* Find correct address and all nodes for this frame. */
Signature · 1 line
2.18.2
Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>