提交 8bb0daef 编写于 作者: V Vincent Chen 提交者: Paul Walmsley

riscv: Correct the handling of unexpected ebreak in do_trap_break()

For the kernel space, all ebreak instructions are determined at compile
time because the kernel space debugging module is currently unsupported.
Hence, it should be treated as a bug if an ebreak instruction which does
not belong to BUG_TRAP_TYPE_WARN or BUG_TRAP_TYPE_BUG is executed in
kernel space. For the userspace, debugging module or user problem may
intentionally insert an ebreak instruction to trigger a SIGTRAP signal.
To approach the above two situations, the do_trap_break() will direct
the BUG_TRAP_TYPE_NONE ebreak exception issued in kernel space to die()
and will send a SIGTRAP to the trapped process only when the ebreak is
in userspace.
Signed-off-by: NVincent Chen <vincent.chen@sifive.com>
Reviewed-by: NChristoph Hellwig <hch@lst.de>
[paul.walmsley@sifive.com: fixed checkpatch issue]
Signed-off-by: NPaul Walmsley <paul.walmsley@sifive.com>
上级 e0c0fc18
...@@ -130,8 +130,6 @@ asmlinkage void do_trap_break(struct pt_regs *regs) ...@@ -130,8 +130,6 @@ asmlinkage void do_trap_break(struct pt_regs *regs)
type = report_bug(regs->sepc, regs); type = report_bug(regs->sepc, regs);
switch (type) { switch (type) {
#ifdef CONFIG_GENERIC_BUG #ifdef CONFIG_GENERIC_BUG
case BUG_TRAP_TYPE_NONE:
break;
case BUG_TRAP_TYPE_WARN: case BUG_TRAP_TYPE_WARN:
regs->sepc += get_break_insn_length(regs->sepc); regs->sepc += get_break_insn_length(regs->sepc);
return; return;
...@@ -140,8 +138,10 @@ asmlinkage void do_trap_break(struct pt_regs *regs) ...@@ -140,8 +138,10 @@ asmlinkage void do_trap_break(struct pt_regs *regs)
default: default:
die(regs, "Kernel BUG"); die(regs, "Kernel BUG");
} }
} else {
force_sig_fault(SIGTRAP, TRAP_BRKPT,
(void __user *)(regs->sepc));
} }
force_sig_fault(SIGTRAP, TRAP_BRKPT, (void __user *)(regs->sepc));
} }
#ifdef CONFIG_GENERIC_BUG #ifdef CONFIG_GENERIC_BUG
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册