Re: [PATCH] objtool: Fix stack overflow in validate_branch()

From: Josh Poimboeuf
Date: Tue Dec 02 2025 - 11:28:52 EST


On Tue, Dec 02, 2025 at 08:16:28AM -0800, Josh Poimboeuf wrote:
> -static int handle_insn_ops(struct instruction *insn,
> - struct instruction *next_insn,
> - struct insn_state *state)
> +static int noinline handle_insn_ops(struct instruction *insn,
> + struct instruction *next_insn,
> + struct insn_state *state)
> {
> + struct insn_state prev_state __maybe_unused = *state;
> struct stack_op *op;
> - int ret;
> + int ret = 0;
>
> for (op = insn->stack_ops; op; op = op->next) {
>
> ret = update_cfi_state(insn, next_insn, &state->cfi, op);
> if (ret)
> - return ret;
> + goto done;
>
> if (!opts.uaccess || !insn->alt_group)
> continue;
> @@ -3303,7 +3304,8 @@ static int handle_insn_ops(struct instruction *insn,
> state->uaccess_stack = 1;
> } else if (state->uaccess_stack >> 31) {
> WARN_INSN(insn, "PUSHF stack exhausted");
> - return 1;
> + ret = 1;
> + goto done;
> }
> state->uaccess_stack <<= 1;
> state->uaccess_stack |= state->uaccess;
> @@ -3319,6 +3321,8 @@ static int handle_insn_ops(struct instruction *insn,
> }
> }
>
> +done:
> + TRACE_INSN_STATE(insn, &prev_state, state);
> return 0;
> }

Argh, that should return 'ret'. Ingo, can you fix that or should I post
a v2?

--
Josh