Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

arch/mips/kernel/traps.c

+2 −2
Original line number Diff line number Diff line
@@ -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;



	/*
@@ -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.  */

include/asm-mips/bug.h

+2 −1
Original line number Diff line number Diff line
@@ -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