From: Oleg Nesterov Date: Mon, 7 Apr 2014 14:22:58 +0000 (+0200) Subject: uprobes/x86: Emulate relative conditional "near" jmp's X-Git-Tag: omap-for-v3.16/fixes-against-rc1~34^2~40^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cc5e7ff2c38641060f20786a5caf2815edbca5f;p=pandora-kernel.git uprobes/x86: Emulate relative conditional "near" jmp's Change branch_setup_xol_ops() to simply use opc1 = OPCODE2(insn) - 0x10 if OPCODE1() == 0x0f; this matches the "short" jmp which checks the same condition. Thanks to lib/insn.c, it does the rest correctly. branch->ilen/offs are correct no matter if this jmp is "near" or "short". Reported-by: Jonathan Lebon Signed-off-by: Oleg Nesterov Reviewed-by: Jim Keniston --- Reading git-diff-tree failed