From: Josh Law <hlcj1234567@gmail.com>
To: Masami Hiramatsu <mhiramat@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Josh Law <objecting@objecting.org>,
linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org
Subject: [PATCH v2 3/3] lib/bootconfig: fix snprintf truncation check in xbc_node_compose_key_after()
Date: Thu, 12 Mar 2026 19:11:43 +0000 [thread overview]
Message-ID: <20260312191143.28719-4-objecting@objecting.org> (raw)
In-Reply-To: <20260312191143.28719-1-objecting@objecting.org>
From: Josh Law <objecting@objecting.org>
snprintf() returns the number of characters that would have been
written excluding the NUL terminator. Output is truncated when the
return value is >= the buffer size, not just > the buffer size.
When ret == size, the current code takes the non-truncated path,
advancing buf by ret and reducing size to 0. This is wrong because
the output was actually truncated (the last character was replaced by
NUL). Fix by using >= so the truncation path is taken correctly.
Signed-off-by: Josh Law <objecting@objecting.org>
---
lib/bootconfig.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/bootconfig.c b/lib/bootconfig.c
index 62b4ed7a0ba6..b0ef1e74e98a 100644
--- a/lib/bootconfig.c
+++ b/lib/bootconfig.c
@@ -316,7 +316,7 @@ int __init xbc_node_compose_key_after(struct xbc_node *root,
depth ? "." : "");
if (ret < 0)
return ret;
- if (ret > size) {
+ if (ret >= size) {
size = 0;
} else {
size -= ret;
--
2.34.1
next prev parent reply other threads:[~2026-03-12 19:11 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 ` Josh Law [this message]
2026-03-12 21:09 ` [PATCH v2 3/3] lib/bootconfig: fix snprintf truncation check in xbc_node_compose_key_after() Steven Rostedt
2026-03-13 2:26 ` Masami Hiramatsu
2026-03-13 4:18 ` [PATCH] bootconfig: Add bootconfig tests about braces Masami Hiramatsu (Google)
2026-03-13 7:10 ` 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=20260312191143.28719-4-objecting@objecting.org \
--to=hlcj1234567@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=objecting@objecting.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