From: Oleg Nesterov Date: Fri, 25 Apr 2014 16:06:19 +0000 (+0200) Subject: uprobes/x86: Kill adjust_ret_addr(), simplify UPROBE_FIX_CALL logic X-Git-Tag: omap-for-v3.16/fixes-against-rc1~34^2~14^2~1^2~7 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1dc76e6eacef271230d9ff6fd0f91824bda03f44;p=pandora-kernel.git uprobes/x86: Kill adjust_ret_addr(), simplify UPROBE_FIX_CALL logic The only insn which could have both UPROBE_FIX_IP and UPROBE_FIX_CALL was 0xe8 "call relative", and now it is handled by branch_xol_ops. So we can change default_post_xol_op(UPROBE_FIX_CALL) to simply push the address of next insn == utask->vaddr + insn.length, just we need to record insn.length into the new auprobe->def.ilen member. Note: if/when we teach branch_xol_ops to support jcxz/loopz we can remove the "correction" logic, UPROBE_FIX_IP can use the same address. Signed-off-by: Oleg Nesterov --- Reading git-diff-tree failed