Commit ba755f8e authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Ralf Baechle

[MIPS] Fix BUG(), BUG_ON() handling

With commit 63dc68a8, 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: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent faea6234
...@@ -650,7 +650,7 @@ asmlinkage void do_bp(struct pt_regs *regs) ...@@ -650,7 +650,7 @@ asmlinkage void do_bp(struct pt_regs *regs)
unsigned int opcode, bcode; unsigned int opcode, bcode;
siginfo_t info; 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; goto out_sigsegv;
/* /*
...@@ -700,7 +700,7 @@ asmlinkage void do_tr(struct pt_regs *regs) ...@@ -700,7 +700,7 @@ asmlinkage void do_tr(struct pt_regs *regs)
unsigned int opcode, tcode = 0; unsigned int opcode, tcode = 0;
siginfo_t info; 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; goto out_sigsegv;
/* Immediate versions don't provide a code. */ /* Immediate versions don't provide a code. */
......
...@@ -18,7 +18,8 @@ do { \ ...@@ -18,7 +18,8 @@ do { \
#define BUG_ON(condition) \ #define BUG_ON(condition) \
do { \ do { \
__asm__ __volatile__("tne $0, %0" : : "r" (condition)); \ __asm__ __volatile__("tne $0, %0, %1" \
: : "r" (condition), "i" (BRK_BUG)); \
} while (0) } while (0)
#define HAVE_ARCH_BUG_ON #define HAVE_ARCH_BUG_ON
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment