On Thu, 12 Mar 2026 19:11:41 +0000
Josh Law <[email protected]> wrote:

> From: Josh Law <[email protected]>
> 
> __xbc_open_brace() pushes entries with post-increment
> (open_brace[brace_index++]), so brace_index always points one past
> the last valid entry.  xbc_verify_tree() reads open_brace[brace_index]
> to report which brace is unclosed, but this is one past the last
> pushed entry and contains stale/zero data, causing the error message
> to reference the wrong node.
> 
> Use open_brace[brace_index - 1] to correctly identify the unclosed
> brace.  brace_index is known to be > 0 here since we are inside the
> if (brace_index) guard.
> 
> Signed-off-by: Josh Law <[email protected]>

Nice catch. May I ask how you found this.

Reviewed-by: Steven Rostedt (Google) <[email protected]>

-- Steve

> ---
>  lib/bootconfig.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/lib/bootconfig.c b/lib/bootconfig.c
> index 2bcd5c2aa87e..a1e6a2e14b01 100644
> --- a/lib/bootconfig.c
> +++ b/lib/bootconfig.c
> @@ -802,7 +802,7 @@ static int __init xbc_verify_tree(void)
>  
>       /* Brace closing */
>       if (brace_index) {
> -             n = &xbc_nodes[open_brace[brace_index]];
> +             n = &xbc_nodes[open_brace[brace_index - 1]];
>               return xbc_parse_error("Brace is not closed",
>                                       xbc_node_get_data(n));
>       }


Reply via email to