diff options
| author | Kudrjavtsev Nickita <n.kudryavcev@samsung.com> | 2013-04-30 20:35:25 +0400 |
|---|---|---|
| committer | Kudrjavtsev Nickita <n.kudryavcev@samsung.com> | 2013-04-30 20:35:25 +0400 |
| commit | 4363921f49ef668ad696073a8f2b1a17f9ce01f3 (patch) | |
| tree | 5efc8a00f0cbd4d765e296299ce2475d51cbfd81 /kprobe | |
| parent | b990ae36f71a030b546d622cabda3abb89b0c5a3 (diff) | |
| parent | f80b896266bcc6fae51386206844dc407f3fd939 (diff) | |
| download | swap-modules-4363921f49ef668ad696073a8f2b1a17f9ce01f3.tar.gz swap-modules-4363921f49ef668ad696073a8f2b1a17f9ce01f3.tar.bz2 swap-modules-4363921f49ef668ad696073a8f2b1a17f9ce01f3.zip | |
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
Diffstat (limited to 'kprobe')
| -rw-r--r-- | kprobe/arch/asm-x86/dbi_kprobes.c | 2 | ||||
| -rw-r--r-- | kprobe/dbi_uprobes.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/kprobe/arch/asm-x86/dbi_kprobes.c b/kprobe/arch/asm-x86/dbi_kprobes.c index cffadefb..80109fef 100644 --- a/kprobe/arch/asm-x86/dbi_kprobes.c +++ b/kprobe/arch/asm-x86/dbi_kprobes.c @@ -1389,7 +1389,7 @@ void __arch_prepare_kretprobe (struct kretprobe *rp, struct pt_regs *regs) ri->rp = rp; ri->rp2 = NULL; ri->task = current; - ri->sp = ®s->EREG(sp); + ri->sp = regs->EREG(sp); /* Replace the return addr with trampoline addr */ if (rp->kp.tgid){ diff --git a/kprobe/dbi_uprobes.c b/kprobe/dbi_uprobes.c index a0bacc11..d13f6d04 100644 --- a/kprobe/dbi_uprobes.c +++ b/kprobe/dbi_uprobes.c @@ -286,19 +286,19 @@ out: int dbi_disarm_urp_inst(struct kretprobe_instance *ri, struct task_struct *rm_task) { struct task_struct *task = rm_task ? rm_task : ri->task; - kprobe_opcode_t *tramp; - kprobe_opcode_t *sp = (kprobe_opcode_t *)((long)ri->sp & ~1); - kprobe_opcode_t *stack = sp - RETPROBE_STACK_DEPTH + 1; - kprobe_opcode_t *found = NULL; - kprobe_opcode_t *buf[RETPROBE_STACK_DEPTH]; + unsigned long *tramp; + unsigned long *sp = (unsigned long *)((long)ri->sp & ~1); + unsigned long *stack = sp - RETPROBE_STACK_DEPTH + 1; + unsigned long *found = NULL; + unsigned long *buf[RETPROBE_STACK_DEPTH]; int i, retval; /* Understand function mode */ if ((long)ri->sp & 1) { - tramp = (kprobe_opcode_t *) + tramp = (unsigned long *) ((unsigned long)ri->rp->kp.ainsn.insn + 0x1b); } else { - tramp = (kprobe_opcode_t *) + tramp = (unsigned long *) (ri->rp->kp.ainsn.insn + UPROBES_TRAMP_RET_BREAK_IDX); } |