From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D23E63859CD for ; Thu, 12 Mar 2026 21:03:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773349436; cv=none; b=T/+39924TO6DGdeboyWe5NmQGUrlO9e5cbCeSNZGe/28rMICCEVTKLnb9VQfmD3gmmaXNixHw1z1u+vfjr3mAYTkW/PTcHKPxU/1Gwp+mG2vPUY4D+PKa0G+UD8PixsYpfgXS2f1lCoTbq+brWG2rcdkFenpUc+Ju633DT4A+k8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773349436; c=relaxed/simple; bh=Ah4cAU/rsZ89pM1crolpyoa+Kaozqik3Sw2x/N9VOoc=; h=Date:From:To:Cc:Message-ID:In-Reply-To:References:Subject: MIME-Version:Content-Type; b=OY8spWXXsZaFKQMIjae9SxfPGjzFV/Bk7Zn+sJOPqAtVo1lrWa0t/7D4dcII4OJx7WRk2MqBMg4wBJU9IqOky7OYbxlDdDzIb8ygpQloey/sf9RSK5lMU2eMJAXI4P7Cbccve42cCYrnwUtZuoB2bovTCMiPIEuQZ21Aq/UCM9s= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=KKOjBAmC; arc=none smtp.client-ip=209.85.128.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KKOjBAmC" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-48532925a4bso8237605e9.1 for ; Thu, 12 Mar 2026 14:03:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773349432; x=1773954232; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:subject:references :in-reply-to:message-id:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=Ah4cAU/rsZ89pM1crolpyoa+Kaozqik3Sw2x/N9VOoc=; b=KKOjBAmCkfg1GWYM9WSqzUsvo24aSwt9DNSUtf4/upuJx1RrAV0z5VhiZVKaC4uXoA zVSLIVQKqw16zInGyaEoOq5/25U6EjPSe2APUMpIfMU+wLAa+Cy1F21YmYppDl/1MVZt Oi6I3Sad5kaACGVP1KLVHJnolZToAWrNNprVFx3mQA2Y3+YyojKrFcVMAjq/wsoDAOck j0nuslLWEy7RfcC8m6P6tBePOW73Z6VOMM0aFrOkv2Ahb7RvUIJm++cwwVPyTqbhjmHa /HuNmrvDEsuEmjFVFIPxMgJhJKGnuLNTv4gKb6+4ADMZ4hRjkd7n9PXa/Z4/omWhQmVh y2+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773349432; x=1773954232; h=content-transfer-encoding:mime-version:subject:references :in-reply-to:message-id:cc:to:from:date:x-gm-gg:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=Ah4cAU/rsZ89pM1crolpyoa+Kaozqik3Sw2x/N9VOoc=; b=SBi2LiCAYVkxvdGl2QwBa9KYgoD8JickTCVwa9JcuPi2aAi5UnR9Gt20u1YPMqdBXs uvtvuWuiW3TjZ2XBNZ9HQLeEKnLSDFJ7mWP3g7ZikS5ZL6MkDJyVK6hFxKNgVWV970W5 53icskYXNVa2Cjb6OHQYZ7l1vtMhuSXgwhmcIyHoOOlhOeGgIpWKl4Xgdrx3/07TxWFw cEouHwg9jsRq4MC2JmUoXuEz2pJ0Xmil/1D/cwpRJdOAbwu1t1HQjj8jO070Kpq9RhV+ 3CkgvdRM2Y5rFik/mwoQzIvYA2J7/EmBjDi9X6HvjcbOI512gAPzSA6rW4mDPnpBgQLU VYLg== X-Forwarded-Encrypted: i=1; AJvYcCUfv4zmxk3jwJfao5iPlO1zWgwLa9vAytlzjvyxOB7ziATfCWmXuAR8XHvsV/UlDon6NbRZdvSrcXr0Yto=@vger.kernel.org X-Gm-Message-State: AOJu0YyUl/ooQIihQpEuA2/VZZ9ustCXQ9JqPEyeAMa7uZy/GT0TvIiZ Q9UHJj1+aQlG88wJUvfOJY3RtM56dzLpCqJDiF5TIewaArdjXdUz7m8C X-Gm-Gg: ATEYQzwa/7fwobSRZvxtoTH1tLDW4BSGlWvdaVcne2EuGq7FBJbmNOUlZnCCNhBud8i 0FzGqY2BC+T0IW8UZyZSjRf+J8RWMFTwAinnlWX9uUMOrlu5PctyPowNXWU9YxDksnHNzyDQ1Gl /U3RDmAsZu3ziB7cVuZgbgmWCsBI8a5lJlGmyR5l7WzNmqE5AeYnJZQ0tWkXcWFMQ914eRggRL5 2JiWuuN1O5CQGsQGTmPf6G6r5khvBWyBCSE5ivkePFcIZHfGpQA8laxmwe3v7OEj3T9dTfelqDH P6Af4ucVdZcF1bcU7SGG16RDDW7B+VA0zM0LTlUoK1S7nC8J0bFGCQrPyuNy1lk1uQVYJCqfi4C R+zJoHK6gtTFMs3akavE5IuL0oHIkGfHnAFsLc6XwDJX5udQETrG2JoqM0Gk5NDHp99Oljhhorb Io/+G83ALm9k8X5My9 X-Received: by 2002:a05:600c:c4ac:b0:477:7b16:5f9f with SMTP id 5b1f17b1804b1-4855670e7c6mr11729765e9.31.1773349431770; Thu, 12 Mar 2026 14:03:51 -0700 (PDT) Received: from [127.0.0.1] ([86.1.69.5]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4854b66ffe2sm146061635e9.13.2026.03.12.14.03.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 12 Mar 2026 14:03:51 -0700 (PDT) Date: Thu, 12 Mar 2026 21:03:52 +0000 From: Josh Law To: Steven Rostedt Cc: Masami Hiramatsu , Andrew Morton , Josh Law , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Message-ID: <48aee348-5859-4d13-aa88-d0c21a4c0289@gmail.com> In-Reply-To: <20260312170303.61c1233c@gandalf.local.home> References: <20260312191143.28719-1-objecting@objecting.org> <20260312191143.28719-2-objecting@objecting.org> <20260312170303.61c1233c@gandalf.local.home> Subject: Re: [PATCH v2 1/3] lib/bootconfig: fix off-by-one in xbc_verify_tree() unclosed brace error Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Correlation-ID: <48aee348-5859-4d13-aa88-d0c21a4c0289@gmail.com> 12 Mar 2026 21:02:51 Steven Rostedt : > On Thu, 12 Mar 2026 19:11:41 +0000 > Josh Law wrote: > >> From: Josh Law >> >> __xbc_open_brace() pushes entries with post-increment >> (open_brace[brace_index++]), so brace_index always points one past >> the last valid entry.=C2=A0 xbc_verify_tree() reads open_brace[brace_ind= ex] >> 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.=C2=A0 brace_index is known to be > 0 here since we are inside the >> if (brace_index) guard. >> >> Signed-off-by: Josh Law > > Nice catch. May I ask how you found this. > > Reviewed-by: Steven Rostedt (Google) > > -- 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) >> >> =C2=A0=C2=A0=C2=A0 /* Brace closing */ >> =C2=A0=C2=A0=C2=A0 if (brace_index) { >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 n =3D &xbc_nodes[open_brace[brace_= index]]; >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 n =3D &xbc_nodes[open_brace[brace_= index - 1]]; >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return xbc_parse_error("Brace= is not closed", >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 xbc_node_get_data(n)); >> =C2=A0=C2=A0=C2=A0 } Hi Steve, Thanks for the review! I found this while doing a manual audit of the bootconfig parser's error ha= ndling. I noticed that the post-increment in __xbc_open_brace() didn't seem= to align with how xbc_verify_tree() was accessing the index. I verified it= by intentionally passing a malformed config with an unclosed brace and saw= it reporting a 'stale' or incorrect node location