mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-09 23:39:18 +00:00
9f564b92cf
RISC-V software breakpoint trap handlers are used for {k,u}probes.
When trapping from kernelmode, only the kernelmode handlers should be
considered. Vice versa, only usermode handlers for usermode
traps. This is not the case on RISC-V, which can trigger a bug if a
userspace process uses uprobes, and a WARN() is triggered from
kernelmode (which is implemented via {c.,}ebreak).
The kernel will trap on the kernelmode {c.,}ebreak, look for uprobes
handlers, realize incorrectly that uprobes need to be handled, and
exit the trap handler early. The trap returns to re-executing the
{c.,}ebreak, and enter an infinite trap-loop.
The issue was found running the BPF selftest [1].
Fix this issue by only considering the swbp/ss handlers for
kernel/usermode respectively. Also, move CONFIG ifdeffery from traps.c
to the asm/{k,u}probes.h headers.
Note that linux/uprobes.h only include asm/uprobes.h if CONFIG_UPROBES
is defined, which is why asm/uprobes.h needs to be unconditionally
included in traps.c
Link: https://lore.kernel.org/linux-riscv/87v8d19aun.fsf@all.your.base.are.belong.to.us/ # [1]
Fixes: 74784081aac8 ("riscv: Add uprobes supported")
Reviewed-by: Guo Ren <guoren@kernel.org>
Reviewed-by: Nam Cao <namcaov@gmail.com>
Tested-by: Puranjay Mohan <puranjay12@gmail.com>
Signed-off-by: Björn Töpel <bjorn@rivosinc.com>
Link: https://lore.kernel.org/r/20230912065619.62020-1-bjorn@kernel.org
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
55 lines
1.2 KiB
C
55 lines
1.2 KiB
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
/*
|
|
* Copied from arch/arm64/include/asm/kprobes.h
|
|
*
|
|
* Copyright (C) 2013 Linaro Limited
|
|
* Copyright (C) 2017 SiFive
|
|
*/
|
|
|
|
#ifndef _ASM_RISCV_KPROBES_H
|
|
#define _ASM_RISCV_KPROBES_H
|
|
|
|
#include <asm-generic/kprobes.h>
|
|
|
|
#ifdef CONFIG_KPROBES
|
|
#include <linux/types.h>
|
|
#include <linux/ptrace.h>
|
|
#include <linux/percpu.h>
|
|
|
|
#define __ARCH_WANT_KPROBES_INSN_SLOT
|
|
#define MAX_INSN_SIZE 2
|
|
|
|
#define flush_insn_slot(p) do { } while (0)
|
|
#define kretprobe_blacklist_size 0
|
|
|
|
#include <asm/probes.h>
|
|
|
|
struct prev_kprobe {
|
|
struct kprobe *kp;
|
|
unsigned int status;
|
|
};
|
|
|
|
/* per-cpu kprobe control block */
|
|
struct kprobe_ctlblk {
|
|
unsigned int kprobe_status;
|
|
unsigned long saved_status;
|
|
struct prev_kprobe prev_kprobe;
|
|
};
|
|
|
|
void arch_remove_kprobe(struct kprobe *p);
|
|
int kprobe_fault_handler(struct pt_regs *regs, unsigned int trapnr);
|
|
bool kprobe_breakpoint_handler(struct pt_regs *regs);
|
|
bool kprobe_single_step_handler(struct pt_regs *regs);
|
|
#else
|
|
static inline bool kprobe_breakpoint_handler(struct pt_regs *regs)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
static inline bool kprobe_single_step_handler(struct pt_regs *regs)
|
|
{
|
|
return false;
|
|
}
|
|
#endif /* CONFIG_KPROBES */
|
|
#endif /* _ASM_RISCV_KPROBES_H */
|