Skip to content

Commit

Permalink
MIPS: traps: Set correct address limit for breakpoints and traps
Browse files Browse the repository at this point in the history
When a breakpoint or trap happens when operating in kernel mode but
on users behalf (eg syscall) it is necessary to change the address
limit to KERNEL_DS so any address checking can be bypassed and print
the correct stack trace.

Signed-off-by: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com>
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
  • Loading branch information
Leonid Yegoshin authored and Ralf Baechle committed Mar 26, 2014
1 parent b08a9c9 commit 078dde5
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions arch/mips/kernel/traps.c
Original file line number Diff line number Diff line change
Expand Up @@ -865,6 +865,11 @@ asmlinkage void do_bp(struct pt_regs *regs)
enum ctx_state prev_state;
unsigned long epc;
u16 instr[2];
mm_segment_t seg;

seg = get_fs();
if (!user_mode(regs))
set_fs(KERNEL_DS);

prev_state = exception_enter();
if (get_isa16_mode(regs->cp0_epc)) {
Expand Down Expand Up @@ -924,6 +929,7 @@ asmlinkage void do_bp(struct pt_regs *regs)
do_trap_or_bp(regs, bcode, "Break");

out:
set_fs(seg);
exception_exit(prev_state);
return;

Expand All @@ -937,8 +943,13 @@ asmlinkage void do_tr(struct pt_regs *regs)
u32 opcode, tcode = 0;
enum ctx_state prev_state;
u16 instr[2];
mm_segment_t seg;
unsigned long epc = msk_isa16_mode(exception_epc(regs));

seg = get_fs();
if (!user_mode(regs))
set_fs(get_ds());

prev_state = exception_enter();
if (get_isa16_mode(regs->cp0_epc)) {
if (__get_user(instr[0], (u16 __user *)(epc + 0)) ||
Expand All @@ -959,6 +970,7 @@ asmlinkage void do_tr(struct pt_regs *regs)
do_trap_or_bp(regs, tcode, "Trap");

out:
set_fs(seg);
exception_exit(prev_state);
return;

Expand Down

0 comments on commit 078dde5

Please sign in to comment.