Skip to content

Commit 1120a36

Browse files
techyguyperplexablemhiramat
authored andcommitted
lib/bootconfig: fix snprintf truncation check in xbc_node_compose_key_after()
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. Link: https://lore.kernel.org/all/20260312191143.28719-4-objecting@objecting.org/ Fixes: 76db5a2 ("bootconfig: Add Extra Boot Config support") Cc: stable@vger.kernel.org Signed-off-by: Josh Law <objecting@objecting.org> Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
1 parent 560f763 commit 1120a36

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

lib/bootconfig.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ int __init xbc_node_compose_key_after(struct xbc_node *root,
316316
depth ? "." : "");
317317
if (ret < 0)
318318
return ret;
319-
if (ret > size) {
319+
if (ret >= size) {
320320
size = 0;
321321
} else {
322322
size -= ret;

0 commit comments

Comments
 (0)