Skip to content

Commit

Permalink
[MIPS] Fix BUG(), BUG_ON() handling
Browse files Browse the repository at this point in the history
With commit 63dc68a, kernel can not
handle BUG() and BUG_ON() properly since get_user() returns false for
kernel code.  Use __get_user() to skip unnecessary access_ok().  This
patch also make BRK_BUG code encoded in the TNE instruction.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Atsushi Nemoto authored and Ralf Baechle committed Apr 20, 2007
1 parent faea623 commit ba755f8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions arch/mips/kernel/traps.c
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ asmlinkage void do_bp(struct pt_regs *regs)
unsigned int opcode, bcode;
siginfo_t info;

if (get_user(opcode, (unsigned int __user *) exception_epc(regs)))
if (__get_user(opcode, (unsigned int __user *) exception_epc(regs)))
goto out_sigsegv;

/*
Expand Down Expand Up @@ -700,7 +700,7 @@ asmlinkage void do_tr(struct pt_regs *regs)
unsigned int opcode, tcode = 0;
siginfo_t info;

if (get_user(opcode, (unsigned int __user *) exception_epc(regs)))
if (__get_user(opcode, (unsigned int __user *) exception_epc(regs)))
goto out_sigsegv;

/* Immediate versions don't provide a code. */
Expand Down
3 changes: 2 additions & 1 deletion include/asm-mips/bug.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ do { \

#define BUG_ON(condition) \
do { \
__asm__ __volatile__("tne $0, %0" : : "r" (condition)); \
__asm__ __volatile__("tne $0, %0, %1" \
: : "r" (condition), "i" (BRK_BUG)); \
} while (0)

#define HAVE_ARCH_BUG_ON
Expand Down

0 comments on commit ba755f8

Please sign in to comment.