Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit ba755f8ec80fdbf2b5212622eabf7355464c6327

Authored by Atsushi Nemoto
Committed by Ralf Baechle
1 parent faea623464
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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

With commit 63dc68a8cf60cb110b147dab1704d990808b39e2, 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>

Showing 2 changed files with 4 additions and 3 deletions Side-by-side Diff

arch/mips/kernel/traps.c
Diff comments   View file @ ba755f8
... ... @@ -650,7 +650,7 @@
650 650 unsigned int opcode, bcode;
651 651 siginfo_t info;
652 652  
653   - if (get_user(opcode, (unsigned int __user *) exception_epc(regs)))
  653 + if (__get_user(opcode, (unsigned int __user *) exception_epc(regs)))
654 654 goto out_sigsegv;
655 655  
656 656 /*
... ... @@ -700,7 +700,7 @@
700 700 unsigned int opcode, tcode = 0;
701 701 siginfo_t info;
702 702  
703   - if (get_user(opcode, (unsigned int __user *) exception_epc(regs)))
  703 + if (__get_user(opcode, (unsigned int __user *) exception_epc(regs)))
704 704 goto out_sigsegv;
705 705  
706 706 /* Immediate versions don't provide a code. */
include/asm-mips/bug.h
Diff comments   View file @ ba755f8
... ... @@ -18,7 +18,8 @@
18 18  
19 19 #define BUG_ON(condition) \
20 20 do { \
21   - __asm__ __volatile__("tne $0, %0" : : "r" (condition)); \
  21 + __asm__ __volatile__("tne $0, %0, %1" \
  22 + : : "r" (condition), "i" (BRK_BUG)); \
22 23 } while (0)
23 24  
24 25 #define HAVE_ARCH_BUG_ON