diff options
| author | Linus Torvalds | 2016-12-07 10:56:00 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2016-12-07 10:56:00 -0800 |
| commit | 407cf05d46fe59e2becfad3a55387d172f6fd0d0 (patch) | |
| tree | 1411998aeb0cc2f82d3af353ba0643e342ae4960 | |
| parent | ce779d6b5bbe6a32452a882605d09518cc79e4ba (diff) | |
| parent | 69042bf2001b44e81cd86ab11a4637b9d9a14c5a (diff) | |
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
| -rw-r--r-- | tools/objtool/arch/x86/decode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/objtool/arch/x86/decode.c b/tools/objtool/arch/x86/decode.c index b63a31be1218..5e0dea2cdc01 100644 --- a/tools/objtool/arch/x86/decode.c +++ b/tools/objtool/arch/x86/decode.c @@ -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) |