Skip to content

Commit 1693286

Browse files
olsajiriPeter Zijlstra
authored andcommitted
uprobes/x86: Use proper mm_struct in __in_uprobe_trampoline
In the unregister path we use __in_uprobe_trampoline check with current->mm for the VMA lookup, which is wrong, because we are in the tracer context, not the traced process. Add mm_struct pointer argument to __in_uprobe_trampoline and changing related callers to pass proper mm_struct pointer. Fixes: ba2bfc9 ("uprobes/x86: Add support to optimize uprobes") Reported-by: syzbot+61ce80689253f42e6d80@syzkaller.appspotmail.com Signed-off-by: Jiri Olsa <jolsa@kernel.org> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Oleg Nesterov <oleg@redhat.com> Acked-by: Andrii Nakryiko <andrii@kernel.org> Tested-by: syzbot+61ce80689253f42e6d80@syzkaller.appspotmail.com Link: https://patch.msgid.link/20260701111337.53943-2-jolsa@kernel.org
1 parent 5166973 commit 1693286

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

arch/x86/kernel/uprobes.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -761,9 +761,9 @@ void arch_uprobe_clear_state(struct mm_struct *mm)
761761
destroy_uprobe_trampoline(tramp);
762762
}
763763

764-
static bool __in_uprobe_trampoline(unsigned long ip)
764+
static bool __in_uprobe_trampoline(struct mm_struct *mm, unsigned long ip)
765765
{
766-
struct vm_area_struct *vma = vma_lookup(current->mm, ip);
766+
struct vm_area_struct *vma = vma_lookup(mm, ip);
767767

768768
return vma && vma_is_special_mapping(vma, &tramp_mapping);
769769
}
@@ -776,14 +776,14 @@ static bool in_uprobe_trampoline(unsigned long ip)
776776

777777
rcu_read_lock();
778778
if (mmap_lock_speculate_try_begin(mm, &seq)) {
779-
found = __in_uprobe_trampoline(ip);
779+
found = __in_uprobe_trampoline(mm, ip);
780780
retry = mmap_lock_speculate_retry(mm, seq);
781781
}
782782
rcu_read_unlock();
783783

784784
if (retry) {
785785
mmap_read_lock(mm);
786-
found = __in_uprobe_trampoline(ip);
786+
found = __in_uprobe_trampoline(mm, ip);
787787
mmap_read_unlock(mm);
788788
}
789789
return found;
@@ -1044,7 +1044,7 @@ static int copy_from_vaddr(struct mm_struct *mm, unsigned long vaddr, void *dst,
10441044
return 0;
10451045
}
10461046

1047-
static bool __is_optimized(uprobe_opcode_t *insn, unsigned long vaddr)
1047+
static bool __is_optimized(struct mm_struct *mm, uprobe_opcode_t *insn, unsigned long vaddr)
10481048
{
10491049
struct __packed __arch_relative_insn {
10501050
u8 op;
@@ -1053,7 +1053,7 @@ static bool __is_optimized(uprobe_opcode_t *insn, unsigned long vaddr)
10531053

10541054
if (!is_call_insn(insn))
10551055
return false;
1056-
return __in_uprobe_trampoline(vaddr + 5 + call->raddr);
1056+
return __in_uprobe_trampoline(mm, vaddr + 5 + call->raddr);
10571057
}
10581058

10591059
static int is_optimized(struct mm_struct *mm, unsigned long vaddr)
@@ -1064,7 +1064,7 @@ static int is_optimized(struct mm_struct *mm, unsigned long vaddr)
10641064
err = copy_from_vaddr(mm, vaddr, &insn, 5);
10651065
if (err)
10661066
return err;
1067-
return __is_optimized((uprobe_opcode_t *)&insn, vaddr);
1067+
return __is_optimized(mm, (uprobe_opcode_t *)&insn, vaddr);
10681068
}
10691069

10701070
static bool should_optimize(struct arch_uprobe *auprobe)

0 commit comments

Comments
 (0)