From: Rosen Penev <rosenp@gmail.com>
Date: Thu, 3 Oct 2024 02:19:41 +0000 (-0700)
Subject: mkfs.jffs2: fix segfault when parsing dev table
X-Git-Tag: v2.3.0~120
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cba2d7875328b05a4a76f619de0ce7050f2df971;p=mtd-utils.git

mkfs.jffs2: fix segfault when parsing dev table

Make sure that the first item is parsed correctly. One issue otherwise is
a null pointer dereference when the first item is not found.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Reviewed-by: Zhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
---

diff --git a/jffsX-utils/mkfs.jffs2.c b/jffsX-utils/mkfs.jffs2.c
index b9dd96b..da07b69 100644
--- a/jffsX-utils/mkfs.jffs2.c
+++ b/jffsX-utils/mkfs.jffs2.c
@@ -428,7 +428,7 @@ static int interpret_table_entry(struct filesystem_entry *root, char *line)
 
 	if (sscanf (line, "%" SCANF_PREFIX "s %c %lo %lu %lu %lu %lu %lu %lu %lu",
 				SCANF_STRING(name), &type, &mode, &uid, &gid, &major, &minor,
-				&start, &increment, &count) < 0)
+				&start, &increment, &count) < 2)
 	{
 		return 1;
 	}