mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-09-22 09:34:56 +02:00
lib/bootconfig: fix snprintf truncation check in xbc_node_compose_key_after()
commit1120a36bb1upstream. 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:76db5a27a8("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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
f591938072
commit
bbdb80f29e
+1
-1
@@ -318,7 +318,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;
|
||||
|
||||
Reference in New Issue
Block a user