diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-05-19 12:32:07 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-05-19 12:32:07 +0200 |
| commit | 9a33fc217d2248838d52f8ef214b1909073f3eb4 (patch) | |
| tree | 7f8c76824f1a555b69802f91ed9be00558cbf47a /arch/sh | |
| parent | sh: use the common ascii hex helpers (diff) | |
| download | linux-9a33fc217d2248838d52f8ef214b1909073f3eb4.tar.xz linux-9a33fc217d2248838d52f8ef214b1909073f3eb4.zip | |
sh: Make is_valid_bugaddr() more intelligent on nommu.
Currently is_valid_bugaddr() is true for anything >= PAGE_OFFSET, which
happens to be 0 on nommu configurations. Make this a bit smarter by just
reading in the opcode and comparing it against the trap type that we
already know. Follows the logic from avr32.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/kernel/traps.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c index a3bdc68ef02c..438f1ebcc453 100644 --- a/arch/sh/kernel/traps.c +++ b/arch/sh/kernel/traps.c @@ -4,6 +4,7 @@ #include <linux/kdebug.h> #include <linux/signal.h> #include <linux/sched.h> +#include <linux/uaccess.h> #include <asm/system.h> #ifdef CONFIG_BUG @@ -21,7 +22,14 @@ static void handle_BUG(struct pt_regs *regs) int is_valid_bugaddr(unsigned long addr) { - return addr >= PAGE_OFFSET; + unsigned short opcode; + + if (addr < PAGE_OFFSET) + return 0; + if (probe_kernel_address((u16 *)addr, opcode)) + return 0; + + return opcode == TRAPA_BUG_OPCODE; } #endif |