From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 16FB03C3C00; Fri, 3 Jul 2026 11:49:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783079377; cv=none; b=pRdSrF8Of2ssepJa/W5HAOKqUCeGGDFoddo8EznASwd7Qa5vnTT6o97y/RoAFWecJCJluNESYD3/0RhUVOQDkxgwJfyyauIECxXJl5Holx5MEtA0QcGkIAHSjrl7s5ngALwAh07f4UVrB+f1/DknSDbQIhJAspBibSzjrG8yyq4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783079377; c=relaxed/simple; bh=0a6b5N9kVxHyDqF31zxAyCxDdpObNpX9TFImKoXEgAY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QrARin+ZUNlelZdU9g0YhayD0q6sEeWodWfUzB6dWIo5HohJPnOY+nmnUqlHs5ozl0DFCaRUSAq8u8D13FYrJ5kxJ3kg7p4LyXY8HYQMZvLkHrPLRXNqbmN/bTbVD8ZG/QNpt1QRdW6rMg8o3wXHiyCFzBqOtPtH48Vlte9M1VE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=F6coPZYO; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="F6coPZYO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 498651F00A3A; Fri, 3 Jul 2026 11:49:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783079375; bh=RcEIFSOD+V7JTMGudvrJflbiQwkbYio+/YGVj8j3aZU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=F6coPZYOu7nPS5X8FA1RFuYHwknOoAeImMJK8ieUHMDqnXEtQ8jx9fRku7FhTWCuL vLuxO9/yQGkaWuDUwlWFLk8eerMC5NWCOC1rdKDkkwiFsnxIxFHfds9l1dWETKOik9 mg9Df/TlqYqUI7v0iDLR8RUZfh24NbQ/nmbdvxZoTusudWjYOwbvx8YelWViQqNyG9 mqSJqbAMbDUrEcEj0t1Q5ue73xEeaM9hvAhYF/gyqNj78lY8AypARUqiAIF7V3pWsZ jeTSoU0E94UcRivHPqYALbEmoq31TDaO1/qv1i0kiiWwz4g3IBu+sC3gMAYSEu9QkX oJbRE+IZLqEsA== From: Jiri Olsa To: Oleg Nesterov , Peter Zijlstra , Ingo Molnar , Masami Hiramatsu , Andrii Nakryiko Cc: bpf@vger.kernel.org, linux-trace-kernel@vger.kernel.org Subject: [PATCHv6 01/13] uprobes/x86: Use proper mm_struct in __in_uprobe_trampoline Date: Fri, 3 Jul 2026 13:49:05 +0200 Message-ID: <20260703114917.238144-2-jolsa@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260703114917.238144-1-jolsa@kernel.org> References: <20260703114917.238144-1-jolsa@kernel.org> Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: ba2bfc97b462 ("uprobes/x86: Add support to optimize uprobes") Acked-by: Andrii Nakryiko Reviewed-by: Oleg Nesterov Signed-off-by: Jiri Olsa --- arch/x86/kernel/uprobes.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c index ebb1baf1eb1d..2be6707e3320 100644 --- a/arch/x86/kernel/uprobes.c +++ b/arch/x86/kernel/uprobes.c @@ -761,9 +761,9 @@ void arch_uprobe_clear_state(struct mm_struct *mm) destroy_uprobe_trampoline(tramp); } -static bool __in_uprobe_trampoline(unsigned long ip) +static bool __in_uprobe_trampoline(struct mm_struct *mm, unsigned long ip) { - struct vm_area_struct *vma = vma_lookup(current->mm, ip); + struct vm_area_struct *vma = vma_lookup(mm, ip); return vma && vma_is_special_mapping(vma, &tramp_mapping); } @@ -776,14 +776,14 @@ static bool in_uprobe_trampoline(unsigned long ip) rcu_read_lock(); if (mmap_lock_speculate_try_begin(mm, &seq)) { - found = __in_uprobe_trampoline(ip); + found = __in_uprobe_trampoline(mm, ip); retry = mmap_lock_speculate_retry(mm, seq); } rcu_read_unlock(); if (retry) { mmap_read_lock(mm); - found = __in_uprobe_trampoline(ip); + found = __in_uprobe_trampoline(mm, ip); mmap_read_unlock(mm); } return found; @@ -1044,7 +1044,7 @@ static int copy_from_vaddr(struct mm_struct *mm, unsigned long vaddr, void *dst, return 0; } -static bool __is_optimized(uprobe_opcode_t *insn, unsigned long vaddr) +static bool __is_optimized(struct mm_struct *mm, uprobe_opcode_t *insn, unsigned long vaddr) { struct __packed __arch_relative_insn { u8 op; @@ -1053,7 +1053,7 @@ static bool __is_optimized(uprobe_opcode_t *insn, unsigned long vaddr) if (!is_call_insn(insn)) return false; - return __in_uprobe_trampoline(vaddr + 5 + call->raddr); + return __in_uprobe_trampoline(mm, vaddr + 5 + call->raddr); } 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) err = copy_from_vaddr(mm, vaddr, &insn, 5); if (err) return err; - return __is_optimized((uprobe_opcode_t *)&insn, vaddr); + return __is_optimized(mm, (uprobe_opcode_t *)&insn, vaddr); } static bool should_optimize(struct arch_uprobe *auprobe) -- 2.54.0