Skip to contentSkip to conversation

e4defrag: avoid potential buffer overflow caused by very long file names

PATCH New Theodore Ts'o 1 participant 1 message Feb 1, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 e4defrag: avoid potential buffer overflow caused by very long file names

Addresses-Coverity-Bug: 1520603

---
 misc/e4defrag.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
misc/e4defrag.c +4 -3
index 33bd05d2..99bc2cd7 100644
@@ -1041,7 +1041,7 @@ static int file_statistic(const char *file, const struct stat64 *buf,
 	__u64	size_per_ext = 0;
 	float	ratio = 0.0;
 	ext4_fsblk_t	blk_count = 0;
-	char	msg_buffer[PATH_MAX + 24];
+	char	msg_buffer[PATH_MAX + 48];
 	struct fiemap_extent_list *physical_list_head = NULL;
 	struct fiemap_extent_list *logical_list_head = NULL;
 
@@ -1210,8 +1210,9 @@ static int file_statistic(const char *file, const struct stat64 *buf,
 
 	if (mode_flag & DETAIL) {
 		/* Print statistic info */
-		sprintf(msg_buffer, "[%u/%u]%s",
-				defraged_file_count, total_count, file);
+		sprintf(msg_buffer, "[%u/%u]%.*s",
+				defraged_file_count, total_count,
+			PATH_MAX, file);
 		if (current_uid == ROOT_UID) {
 			if (strlen(msg_buffer) > 40)
 				printf("\033[79;0H\033[K%s\n"
Signature · 1 line
2.31.0