Commit 407cf05d authored by Linus Torvalds's avatar 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
...@@ -99,7 +99,7 @@ int arch_decode_instruction(struct elf *elf, struct section *sec, ...@@ -99,7 +99,7 @@ int arch_decode_instruction(struct elf *elf, struct section *sec,
break; break;
case 0x8d: case 0x8d:
if (insn.rex_prefix.bytes && if (insn.rex_prefix.nbytes &&
insn.rex_prefix.bytes[0] == 0x48 && insn.rex_prefix.bytes[0] == 0x48 &&
insn.modrm.nbytes && insn.modrm.bytes[0] == 0x2c && insn.modrm.nbytes && insn.modrm.bytes[0] == 0x2c &&
insn.sib.nbytes && insn.sib.bytes[0] == 0x24) insn.sib.nbytes && insn.sib.bytes[0] == 0x24)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment