Commit cf31ec3f authored Dec 30, 2012 by Oleg Nesterov

uprobes/x86: Change __skip_sstep() to actually skip the whole insn



__skip_sstep() doesn't update regs->ip. Currently this is correct
but only "by accident" and it doesn't skip the whole insn. Change
it to advance ->ip by the length of the detected 0x66*0x90 sequence.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>

parent da1816b1

arch/x86/kernel/uprobes.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -680,8 +680,11 @@ static bool __skip_sstep(struct arch_uprobe auprobe, struct pt_regs regs)
		if (auprobe->insn[i] == 0x66)
		continue;

		if (auprobe->insn[i] == 0x90)
		if (auprobe->insn[i] == 0x90) {
		regs->ip = uprobe_get_swbp_addr(regs);
		regs->ip += i + 1;
		return true;
		}

		break;
		}