Pārlūkot izejas kodu

s390/kprobes: fix instruction copy for out of line execution

When we generate the instruction for out of line execution the length
of the to be copied instruction was evaluated from a not initialized
memory location.
Therefore we ended up with a random (2, 4 or 6) number of bytes being
copied instead of taking the real instruction length into account.
This works surprisingly well most of the time, but still not always.

Reported-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Heiko Carstens 10 gadi atpakaļ
vecāks
revīzija
ed7d56e174
1 mainītis faili ar 1 papildinājumiem un 1 dzēšanām
  1. 1 1
      arch/s390/kernel/kprobes.c

+ 1 - 1
arch/s390/kernel/kprobes.c

@@ -74,7 +74,7 @@ static void copy_instruction(struct kprobe *p)
 		ftrace_generate_nop_insn((struct ftrace_insn *)p->ainsn.insn);
 		p->ainsn.is_ftrace_insn = 1;
 	} else
-		memcpy(p->ainsn.insn, p->addr, insn_length(p->opcode >> 8));
+		memcpy(p->ainsn.insn, p->addr, insn_length(*p->addr >> 8));
 	p->opcode = p->ainsn.insn[0];
 	if (!probe_is_insn_relative_long(p->ainsn.insn))
 		return;