From: "Masami Hiramatsu (Google)" <mhiramat@kernel.org>
To: Masami Hiramatsu <mhiramat@kernel.org>,
Steven Rostedt <rostedt@goodmis.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Josh Law <objecting@objecting.org>,
linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org
Subject: [PATCH] bootconfig: Add bootconfig tests about braces
Date: Fri, 13 Mar 2026 13:18:55 +0900 [thread overview]
Message-ID: <177337553551.416919.11217619471547711262.stgit@devnote2> (raw)
In-Reply-To: <20260312191143.28719-1-objecting@objecting.org>
From: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Add more bootconfig tests for checking the error message of
non closing brace and max number of nested braces.
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
---
.../bootconfig/samples/bad-non-closed-brace.bconf | 4 ++++
tools/bootconfig/samples/bad-over-max-brace.bconf | 19 +++++++++++++++++++
.../bootconfig/samples/exp-good-nested-brace.bconf | 1 +
tools/bootconfig/samples/good-nested-brace.bconf | 18 ++++++++++++++++++
tools/bootconfig/test-bootconfig.sh | 9 +++++++++
5 files changed, 51 insertions(+)
create mode 100644 tools/bootconfig/samples/bad-non-closed-brace.bconf
create mode 100644 tools/bootconfig/samples/bad-over-max-brace.bconf
create mode 100644 tools/bootconfig/samples/exp-good-nested-brace.bconf
create mode 100644 tools/bootconfig/samples/good-nested-brace.bconf
diff --git a/tools/bootconfig/samples/bad-non-closed-brace.bconf b/tools/bootconfig/samples/bad-non-closed-brace.bconf
new file mode 100644
index 000000000000..6ed9f3363dde
--- /dev/null
+++ b/tools/bootconfig/samples/bad-non-closed-brace.bconf
@@ -0,0 +1,4 @@
+foo {
+ bar {
+ buz
+ }
diff --git a/tools/bootconfig/samples/bad-over-max-brace.bconf b/tools/bootconfig/samples/bad-over-max-brace.bconf
new file mode 100644
index 000000000000..74b5dc9e21dc
--- /dev/null
+++ b/tools/bootconfig/samples/bad-over-max-brace.bconf
@@ -0,0 +1,19 @@
+key1 {
+key2 {
+key3 {
+key4 {
+key5 {
+key6 {
+key7 {
+key8 {
+key9 {
+key10 {
+key11 {
+key12 {
+key13 {
+key14 {
+key15 {
+key16 {
+key17 {
+}}}}}}}}}}}}}}}}}
+
diff --git a/tools/bootconfig/samples/exp-good-nested-brace.bconf b/tools/bootconfig/samples/exp-good-nested-brace.bconf
new file mode 100644
index 000000000000..19e0f51b4553
--- /dev/null
+++ b/tools/bootconfig/samples/exp-good-nested-brace.bconf
@@ -0,0 +1 @@
+key1.key2.key3.key4.key5.key6.key7.key8.key9.key10.key11.key12.key13.key14.key15.key16;
diff --git a/tools/bootconfig/samples/good-nested-brace.bconf b/tools/bootconfig/samples/good-nested-brace.bconf
new file mode 100644
index 000000000000..980d094f296e
--- /dev/null
+++ b/tools/bootconfig/samples/good-nested-brace.bconf
@@ -0,0 +1,18 @@
+key1 {
+key2 {
+key3 {
+key4 {
+key5 {
+key6 {
+key7 {
+key8 {
+key9 {
+key10 {
+key11 {
+key12 {
+key13 {
+key14 {
+key15 {
+key16 {
+}}}}}}}}}}}}}}}}
+
diff --git a/tools/bootconfig/test-bootconfig.sh b/tools/bootconfig/test-bootconfig.sh
index be9bd18b1d56..fc69f815ce4a 100755
--- a/tools/bootconfig/test-bootconfig.sh
+++ b/tools/bootconfig/test-bootconfig.sh
@@ -171,6 +171,15 @@ $BOOTCONF $INITRD > $OUTFILE
xfail grep -q 'val[[:space:]]' $OUTFILE
xpass grep -q 'val2[[:space:]]' $OUTFILE
+echo "Showing correct line:column of no closing brace"
+cat > $TEMPCONF << EOF
+foo {
+bar {
+}
+EOF
+$BOOTCONF -a $TEMPCONF $INITRD 2> $OUTFILE
+xpass grep -q "1:1" $OUTFILE
+
echo "=== expected failure cases ==="
for i in samples/bad-* ; do
xfail $BOOTCONF -a $i $INITRD
next prev parent reply other threads:[~2026-03-13 4:18 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-12 19:11 [PATCH v2 0/3] lib/bootconfig: three bug fixes Josh Law
2026-03-12 19:11 ` [PATCH v2 1/3] lib/bootconfig: fix off-by-one in xbc_verify_tree() unclosed brace error Josh Law
2026-03-12 21:03 ` Steven Rostedt
2026-03-12 21:03 ` Josh Law
2026-03-13 1:39 ` Masami Hiramatsu
2026-03-12 19:11 ` [PATCH v2 2/3] lib/bootconfig: check bounds before writing in __xbc_open_brace() Josh Law
2026-03-12 21:06 ` Steven Rostedt
2026-03-12 21:08 ` Josh Law
2026-03-12 21:09 ` Josh Law
2026-03-12 21:28 ` Andrew Morton
2026-03-12 21:30 ` Josh Law
2026-03-12 21:47 ` Steven Rostedt
2026-03-13 4:18 ` Masami Hiramatsu
2026-03-13 2:10 ` Masami Hiramatsu
2026-03-12 19:11 ` [PATCH v2 3/3] lib/bootconfig: fix snprintf truncation check in xbc_node_compose_key_after() Josh Law
2026-03-12 21:09 ` Steven Rostedt
2026-03-13 2:26 ` Masami Hiramatsu
2026-03-13 4:18 ` Masami Hiramatsu (Google) [this message]
2026-03-13 7:10 ` [PATCH] bootconfig: Add bootconfig tests about braces Josh Law
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=177337553551.416919.11217619471547711262.stgit@devnote2 \
--to=mhiramat@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=objecting@objecting.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox