diff options
| author | Marcin Nowakowski <marcin.nowakowski@imgtec.com> | 2017-06-08 15:20:32 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-09-15 18:30:06 +0100 |
| commit | d13206fb3c79c2378a51dc131577d253b1782e96 (patch) | |
| tree | 47dadde3b908c14ef6b81a29b5c0e1d9960cf237 /arch/mips | |
| parent | f44699a847f0b1bf28938e9d3dd753e1bb6d11ca (diff) | |
| download | linux-stable-d13206fb3c79c2378a51dc131577d253b1782e96.tar.gz linux-stable-d13206fb3c79c2378a51dc131577d253b1782e96.tar.bz2 linux-stable-d13206fb3c79c2378a51dc131577d253b1782e96.zip | |
MIPS: kprobes: flush_insn_slot should flush only if probe initialised
commit 698b851073ddf5a894910d63ca04605e0473414e upstream.
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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'arch/mips')
| -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 daba1f9a4f79..174aedce3167 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) |