[File] [PATCH] Magdir/filesystems: remove wrong magic for JFFS file system

Kamil Dudka kdudka at redhat.com
Tue Nov 12 09:41:45 UTC 2019


The magic 0x1984 was (probably by mistake) ASCII encoded, instead
of binary encoded.  This triggered false positives on ASCII files
that start with the string 1984.

We already have the correct magic for both the old (0x1984) and the
new (0x1985) little endian JFFS2 file systems.  I have added the big
endian variants for consistency, although I have no big endian system
to actually test it.

Originally reported at: https://bugzilla.redhat.com/1771242
---
 magic/Magdir/filesystems | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems
index 7c4fc7dc..1bfae071 100644
--- a/magic/Magdir/filesystems
+++ b/magic/Magdir/filesystems
@@ -2057,10 +2057,6 @@
 >0x10040	lelong	2		yura hash
 >0x10040	lelong	3		r5 hash
 
-# JFFS - russell at coker.com.au
-0	lelong	0x34383931	Linux Journalled Flash File system, little endian
-0	belong	0x34383931	Linux Journalled Flash File system, big endian
-
 # EST flat binary format (which isn't, but anyway)
 # From: Mark Brown <broonie at sirena.org.uk>
 0	string	ESTFBINR	EST flat binary
@@ -2145,7 +2141,9 @@
 
 # JFFS2 file system
 0	leshort	0x1984		Linux old jffs2 filesystem data little endian
+0	beshort	0x1984		Linux old jffs2 filesystem data big endian
 0	leshort	0x1985		Linux jffs2 filesystem data little endian
+0	beshort	0x1985		Linux jffs2 filesystem data big endian
 
 # Squashfs
 0	name	squashfs
-- 
2.20.1



More information about the File mailing list