mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 08:26:59 +00:00
[MIPS] Fix BUG(), BUG_ON() handling
With commit 63dc68a8cf
, 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>
This commit is contained in:
parent
faea623464
commit
ba755f8ec8
2 changed files with 4 additions and 3 deletions
|
@ -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)
|
||||||
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 { \
|
||||||
|
|
||||||
#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
|
||||||
|
|
Loading…
Reference in a new issue