Re: [PATCH v3 17/21] tools/objtool: Convert to insn_decode()

From: Borislav Petkov
Date: Thu Mar 04 2021 - 13:08:12 EST


On Thu, Mar 04, 2021 at 06:49:08PM +0100, Peter Zijlstra wrote:
> This is going to have trivial rejects/fuzz against tip/objtool/core.

I was just wondering whether to you show you how I resolved :)

diff --cc tools/objtool/arch/x86/decode.c
index 431bafb881d4,8380d0b1d933..22a53ee322ea
--- a/tools/objtool/arch/x86/decode.c
+++ b/tools/objtool/arch/x86/decode.c
@@@ -104,14 -90,12 +104,14 @@@ int arch_decode_instruction(const struc
struct list_head *ops_list)
{
struct insn insn;
- int x86_64;
- int x86_64, sign, ret;
- unsigned char op1, op2, rex = 0, rex_b = 0, rex_r = 0, rex_w = 0,
- rex_x = 0, modrm = 0, modrm_mod = 0, modrm_rm = 0,
- modrm_reg = 0, sib = 0;
++ int x86_64, ret;
+ unsigned char op1, op2,
+ rex = 0, rex_b = 0, rex_r = 0, rex_w = 0, rex_x = 0,
+ modrm = 0, modrm_mod = 0, modrm_rm = 0, modrm_reg = 0,
+ sib = 0, /* sib_scale = 0, */ sib_index = 0, sib_base = 0;
struct stack_op *op = NULL;
struct symbol *sym;
+ u64 imm;

x86_64 = is_x86_64(elf);
if (x86_64 == -1)

--
Regards/Gruss,
Boris.

https://people.kernel.org/tglx/notes-about-netiquette