Skip to contentSkip to conversation

lib: string_helpers: silence snprintf() output truncation warning

PATCH Applied Bartosz Golaszewski 2 participants 2 messages Nov 1, 2024 – Nov 2, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 lib: string_helpers: silence snprintf() output truncation warning

From: Bartosz Golaszewski <[email protected]>

The output of ".%03u" with the unsigned int in range [0, 4294966295] may get truncated if the target buffer is not 12 bytes. This can't really happen here as the 'remainder' variable cannot exceed 999 but the compiler doesn't know it. To make it happy just increase the buffer to where the warning goes away.

Fixes 3c9f3681d0b4 ("[SCSI] lib: add generic helper to print sizes rounded to the correct SI range")
Cc James E.J. Bottomley <[email protected]>
Cc Kees Cook <[email protected]>

---
Changes in v2:
- improve the commit message

 lib/string_helpers.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/string_helpers.c +1 -1
index 4f887aa62fa0..91fa37b5c510 100644
@@ -57,7 +57,7 @@ int string_get_size(u64 size, u64 blk_size, const enum string_size_units units,
 	static const unsigned int rounding[] = { 500, 50, 5 };
 	int i = 0, j;
 	u32 remainder = 0, sf_cap;
-	char tmp[8];
+	char tmp[12];
 	const char *unit;
 
 	tmp[0] = '\0';
Signature · 1 line
2.45.2
maintainer Applied
#1 lore raw
Quoted 8 lines · Bartosz Golaszewski

The output of ".%03u" with the unsigned int in range [0, 4294966295] may get truncated if the target buffer is not 12 bytes. This can't really happen here as the 'remainder' variable cannot exceed 999 but the compiler doesn't know it. To make it happy just increase the buffer to where the warning goes away.

[...]

Applied to for-next/hardening, thanks!

[1/1] lib: string_helpers: silence snprintf() output truncation warning

      https://git.kernel.org/kees/c/a508ef4b1dcc

Take care,

Signature · 1 line
Kees Cook