[PATCH] mkfs.jffs2: fix segfault when parsing dev table

[PATCH] mkfs.jffs2: fix segfault when parsing dev table

[Rosen Penev]

Make sure that all 10 items are 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>
---
 jffsX-utils/mkfs.jffs2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jffsX-utils/mkfs.jffs2.c b/jffsX-utils/mkfs.jffs2.c
index b9dd96b..63dac1c 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) < 10)
 	{
 		return 1;
 	}
-- 
2.46.1


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

Re: [PATCH] mkfs.jffs2: fix segfault when parsing dev table

[Zhihao Cheng]

在 2024/9/28 5:14, Rosen Penev 写道:
> Make sure that all 10 items are 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>
> ---
>   jffsX-utils/mkfs.jffs2.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/jffsX-utils/mkfs.jffs2.c b/jffsX-utils/mkfs.jffs2.c
> index b9dd96b..63dac1c 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) < 10)


The last 8 variables are initialized earlier, how about changing like 
following?
				&start, &increment, &count) < 2)
>   	{
>   		return 1;
>   	}
> 


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/