Commit 407cf05d authored Dec 07, 2016 by Linus Torvalds

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull objtool fix from Ingo Molnar:
 "A single late breaking fix for objtool"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  objtool: Fix bytes check of lea's rex_prefix

parents ce779d6b 69042bf2

tools/objtool/arch/x86/decode.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -99,7 +99,7 @@ int arch_decode_instruction(struct elf elf, struct section sec,
		break;

		case 0x8d:
		if (insn.rex_prefix.bytes &&
		if (insn.rex_prefix.nbytes &&
		insn.rex_prefix.bytes[0] == 0x48 &&
		insn.modrm.nbytes && insn.modrm.bytes[0] == 0x2c &&
		insn.sib.nbytes && insn.sib.bytes[0] == 0x24)