diff options
| author | Marcin Nowakowski <marcin.nowakowski@imgtec.com> | 2017-06-08 15:20:32 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2017-06-08 15:35:10 +0200 |
| commit | 397b4c6747599d4e8926408b5dd8b52f7b649e93 (patch) | |
| tree | 66c84f17bd9b4a990b18dd7e6e696e9e490930f4 | |
| parent | 6eb49f22a7a0bfc78be58ca78819584622853e0e (diff) | |
| download | linux-4.8-stable.tar.gz | |
MIPS: kprobes: flush_insn_slot should flush only if probe initialisedlinux-4.8-stable
When ftrace is used with kprobes, it is possible for a kprobe to contain
an invalid location (ie. only initialised to 0 and not to a specific
location in the code). Trying to perform a cache flush on such location
leads to a crash r4k_flush_icache_range().
Fixes: c1bf207d6ee1 ("MIPS: kprobe: Add support.")
Signed-off-by: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/16296/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
(cherry picked from commit a1497c7641ff53ca3632e87030fc905f73f2e7a5)
| -rw-r--r-- | arch/mips/include/asm/kprobes.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/include/asm/kprobes.h b/arch/mips/include/asm/kprobes.h index daba1f9a4f7939..174aedce3167ae 100644 --- a/arch/mips/include/asm/kprobes.h +++ b/arch/mips/include/asm/kprobes.h @@ -40,7 +40,8 @@ typedef union mips_instruction kprobe_opcode_t; #define flush_insn_slot(p) \ do { \ - flush_icache_range((unsigned long)p->addr, \ + if (p->addr) \ + flush_icache_range((unsigned long)p->addr, \ (unsigned long)p->addr + \ (MAX_INSN_SIZE * sizeof(kprobe_opcode_t))); \ } while (0) |