cc2c1b7298
[ Upstream commit 13f8f1e05f1dc36dbba6cba0ae03354c0dafcde7 ] The arm64 uprobes code is broken for big-endian kernels as it doesn't convert the in-memory instruction encoding (which is always little-endian) into the kernel's native endianness before analyzing and simulating instructions. This may result in a few distinct problems: * The kernel may may erroneously reject probing an instruction which can safely be probed. * The kernel may erroneously erroneously permit stepping an instruction out-of-line when that instruction cannot be stepped out-of-line safely. * The kernel may erroneously simulate instruction incorrectly dur to interpretting the byte-swapped encoding. The endianness mismatch isn't caught by the compiler or sparse because: * The arch_uprobe::{insn,ixol} fields are encoded as arrays of u8, so the compiler and sparse have no idea these contain a little-endian 32-bit value. The core uprobes code populates these with a memcpy() which similarly does not handle endianness. * While the uprobe_opcode_t type is an alias for __le32, both arch_uprobe_analyze_insn() and arch_uprobe_skip_sstep() cast from u8[] to the similarly-named probe_opcode_t, which is an alias for u32. Hence there is no endianness conversion warning. Fix this by changing the arch_uprobe::{insn,ixol} fields to __le32 and adding the appropriate __le32_to_cpu() conversions prior to consuming the instruction encoding. The core uprobes copies these fields as opaque ranges of bytes, and so is unaffected by this change. At the same time, remove MAX_UINSN_BYTES and consistently use AARCH64_INSN_SIZE for clarity. Tested with the following: | #include <stdio.h> | #include <stdbool.h> | | #define noinline __attribute__((noinline)) | | static noinline void *adrp_self(void) | { | void *addr; | | asm volatile( | " adrp %x0, adrp_self\n" | " add %x0, %x0, :lo12:adrp_self\n" | : "=r" (addr)); | } | | | int main(int argc, char *argv) | { | void *ptr = adrp_self(); | bool equal = (ptr == adrp_self); | | printf("adrp_self => %p\n" | "adrp_self() => %p\n" | "%s\n", | adrp_self, ptr, equal ? "EQUAL" : "NOT EQUAL"); | | return 0; | } .... where the adrp_self() function was compiled to: | 00000000004007e0 <adrp_self>: | 4007e0: 90000000 adrp x0, 400000 <__ehdr_start> | 4007e4: 911f8000 add x0, x0, #0x7e0 | 4007e8: d65f03c0 ret Before this patch, the ADRP is not recognized, and is assumed to be steppable, resulting in corruption of the result: | # ./adrp-self | adrp_self => 0x4007e0 | adrp_self() => 0x4007e0 | EQUAL | # echo 'p /root/adrp-self:0x007e0' > /sys/kernel/tracing/uprobe_events | # echo 1 > /sys/kernel/tracing/events/uprobes/enable | # ./adrp-self | adrp_self => 0x4007e0 | adrp_self() => 0xffffffffff7e0 | NOT EQUAL After this patch, the ADRP is correctly recognized and simulated: | # ./adrp-self | adrp_self => 0x4007e0 | adrp_self() => 0x4007e0 | EQUAL | # | # echo 'p /root/adrp-self:0x007e0' > /sys/kernel/tracing/uprobe_events | # echo 1 > /sys/kernel/tracing/events/uprobes/enable | # ./adrp-self | adrp_self => 0x4007e0 | adrp_self() => 0x4007e0 | EQUAL Fixes: 9842ceae9fa8 ("arm64: Add uprobe support") Cc: stable@vger.kernel.org Signed-off-by: Mark Rutland <mark.rutland@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will@kernel.org> Link: https://lore.kernel.org/r/20241008155851.801546-4-mark.rutland@arm.com Signed-off-by: Will Deacon <will@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
208 lines
4.8 KiB
C
Executable file
208 lines
4.8 KiB
C
Executable file
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Copyright (C) 2014-2016 Pratyush Anand <panand@redhat.com>
|
|
*/
|
|
#include <linux/highmem.h>
|
|
#include <linux/ptrace.h>
|
|
#include <linux/uprobes.h>
|
|
#include <asm/cacheflush.h>
|
|
|
|
#include "decode-insn.h"
|
|
|
|
#define UPROBE_INV_FAULT_CODE UINT_MAX
|
|
|
|
void arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr,
|
|
void *src, unsigned long len)
|
|
{
|
|
void *xol_page_kaddr = kmap_atomic(page);
|
|
void *dst = xol_page_kaddr + (vaddr & ~PAGE_MASK);
|
|
|
|
/* Initialize the slot */
|
|
memcpy(dst, src, len);
|
|
|
|
/* flush caches (dcache/icache) */
|
|
sync_icache_aliases(dst, len);
|
|
|
|
kunmap_atomic(xol_page_kaddr);
|
|
}
|
|
|
|
unsigned long uprobe_get_swbp_addr(struct pt_regs *regs)
|
|
{
|
|
return instruction_pointer(regs);
|
|
}
|
|
|
|
int arch_uprobe_analyze_insn(struct arch_uprobe *auprobe, struct mm_struct *mm,
|
|
unsigned long addr)
|
|
{
|
|
probe_opcode_t insn;
|
|
|
|
/* TODO: Currently we do not support AARCH32 instruction probing */
|
|
if (mm->context.flags & MMCF_AARCH32)
|
|
return -EOPNOTSUPP;
|
|
else if (!IS_ALIGNED(addr, AARCH64_INSN_SIZE))
|
|
return -EINVAL;
|
|
|
|
insn = le32_to_cpu(auprobe->insn);
|
|
|
|
switch (arm_probe_decode_insn(insn, &auprobe->api)) {
|
|
case INSN_REJECTED:
|
|
return -EINVAL;
|
|
|
|
case INSN_GOOD_NO_SLOT:
|
|
auprobe->simulate = true;
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int arch_uprobe_pre_xol(struct arch_uprobe *auprobe, struct pt_regs *regs)
|
|
{
|
|
struct uprobe_task *utask = current->utask;
|
|
|
|
/* Initialize with an invalid fault code to detect if ol insn trapped */
|
|
current->thread.fault_code = UPROBE_INV_FAULT_CODE;
|
|
|
|
/* Instruction points to execute ol */
|
|
instruction_pointer_set(regs, utask->xol_vaddr);
|
|
|
|
user_enable_single_step(current);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int arch_uprobe_post_xol(struct arch_uprobe *auprobe, struct pt_regs *regs)
|
|
{
|
|
struct uprobe_task *utask = current->utask;
|
|
|
|
WARN_ON_ONCE(current->thread.fault_code != UPROBE_INV_FAULT_CODE);
|
|
|
|
/* Instruction points to execute next to breakpoint address */
|
|
instruction_pointer_set(regs, utask->vaddr + 4);
|
|
|
|
user_disable_single_step(current);
|
|
|
|
return 0;
|
|
}
|
|
bool arch_uprobe_xol_was_trapped(struct task_struct *t)
|
|
{
|
|
/*
|
|
* Between arch_uprobe_pre_xol and arch_uprobe_post_xol, if an xol
|
|
* insn itself is trapped, then detect the case with the help of
|
|
* invalid fault code which is being set in arch_uprobe_pre_xol
|
|
*/
|
|
if (t->thread.fault_code != UPROBE_INV_FAULT_CODE)
|
|
return true;
|
|
|
|
return false;
|
|
}
|
|
|
|
bool arch_uprobe_skip_sstep(struct arch_uprobe *auprobe, struct pt_regs *regs)
|
|
{
|
|
probe_opcode_t insn;
|
|
unsigned long addr;
|
|
|
|
if (!auprobe->simulate)
|
|
return false;
|
|
|
|
insn = le32_to_cpu(auprobe->insn);
|
|
addr = instruction_pointer(regs);
|
|
|
|
if (auprobe->api.handler)
|
|
auprobe->api.handler(insn, addr, regs);
|
|
|
|
return true;
|
|
}
|
|
|
|
void arch_uprobe_abort_xol(struct arch_uprobe *auprobe, struct pt_regs *regs)
|
|
{
|
|
struct uprobe_task *utask = current->utask;
|
|
|
|
/*
|
|
* Task has received a fatal signal, so reset back to probbed
|
|
* address.
|
|
*/
|
|
instruction_pointer_set(regs, utask->vaddr);
|
|
|
|
user_disable_single_step(current);
|
|
}
|
|
|
|
bool arch_uretprobe_is_alive(struct return_instance *ret, enum rp_check ctx,
|
|
struct pt_regs *regs)
|
|
{
|
|
/*
|
|
* If a simple branch instruction (B) was called for retprobed
|
|
* assembly label then return true even when regs->sp and ret->stack
|
|
* are same. It will ensure that cleanup and reporting of return
|
|
* instances corresponding to callee label is done when
|
|
* handle_trampoline for called function is executed.
|
|
*/
|
|
if (ctx == RP_CHECK_CHAIN_CALL)
|
|
return regs->sp <= ret->stack;
|
|
else
|
|
return regs->sp < ret->stack;
|
|
}
|
|
|
|
unsigned long
|
|
arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr,
|
|
struct pt_regs *regs)
|
|
{
|
|
unsigned long orig_ret_vaddr;
|
|
|
|
orig_ret_vaddr = procedure_link_pointer(regs);
|
|
/* Replace the return addr with trampoline addr */
|
|
procedure_link_pointer_set(regs, trampoline_vaddr);
|
|
|
|
return orig_ret_vaddr;
|
|
}
|
|
|
|
int arch_uprobe_exception_notify(struct notifier_block *self,
|
|
unsigned long val, void *data)
|
|
{
|
|
return NOTIFY_DONE;
|
|
}
|
|
|
|
static int uprobe_breakpoint_handler(struct pt_regs *regs,
|
|
unsigned int esr)
|
|
{
|
|
if (uprobe_pre_sstep_notifier(regs))
|
|
return DBG_HOOK_HANDLED;
|
|
|
|
return DBG_HOOK_ERROR;
|
|
}
|
|
|
|
static int uprobe_single_step_handler(struct pt_regs *regs,
|
|
unsigned int esr)
|
|
{
|
|
struct uprobe_task *utask = current->utask;
|
|
|
|
WARN_ON(utask && (instruction_pointer(regs) != utask->xol_vaddr + 4));
|
|
if (uprobe_post_sstep_notifier(regs))
|
|
return DBG_HOOK_HANDLED;
|
|
|
|
return DBG_HOOK_ERROR;
|
|
}
|
|
|
|
/* uprobe breakpoint handler hook */
|
|
static struct break_hook uprobes_break_hook = {
|
|
.imm = UPROBES_BRK_IMM,
|
|
.fn = uprobe_breakpoint_handler,
|
|
};
|
|
|
|
/* uprobe single step handler hook */
|
|
static struct step_hook uprobes_step_hook = {
|
|
.fn = uprobe_single_step_handler,
|
|
};
|
|
|
|
static int __init arch_init_uprobes(void)
|
|
{
|
|
register_user_break_hook(&uprobes_break_hook);
|
|
register_user_step_hook(&uprobes_step_hook);
|
|
|
|
return 0;
|
|
}
|
|
|
|
device_initcall(arch_init_uprobes);
|