diff --git a/SOURCES/file-5.37-jffs-magic.patch b/SOURCES/file-5.37-jffs-magic.patch new file mode 100644 index 0000000..343b00c --- /dev/null +++ b/SOURCES/file-5.37-jffs-magic.patch @@ -0,0 +1,40 @@ +From 432267e707aca36bec55704fd404fa572e2c4b45 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Fri, 15 Nov 2019 23:49:38 +0000 +Subject: [PATCH] fix JFFS2 (the old magic was just hex encoded 0x1984 which is + wrong (Kamil Dudka) + +Upstream-commit: 5ad78c726bb03e0fbdb6d237ef2b13e51968ffea +Signed-off-by: Kamil Dudka +--- + magic/Magdir/filesystems | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems +index 1920e56..da5c580 100644 +--- a/magic/Magdir/filesystems ++++ b/magic/Magdir/filesystems +@@ -1292,10 +1292,6 @@ + >0x10040 lelong 2 yura hash + >0x10040 lelong 3 r5 hash + +-# JFFS - russell@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 + 0 string ESTFBINR EST flat binary +@@ -1372,7 +1368,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 string sqsh Squashfs filesystem, big endian, +-- +2.20.1 + diff --git a/SPECS/file.spec b/SPECS/file.spec index a280f2b..cf82318 100644 --- a/SPECS/file.spec +++ b/SPECS/file.spec @@ -5,7 +5,7 @@ Summary: A utility for determining file types Name: file Version: 5.11 -Release: 36%{?dist} +Release: 37%{?dist} License: BSD Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -75,6 +75,9 @@ Patch61: file-5.11-python-comment.patch # fix out-of-bounds read via a crafted ELF file (CVE-2018-10360) Patch62: file-5.11-CVE-2018-10360.patch +# remove wrong magic for JFFS file system (#1773477) +Patch63: file-5.37-jffs-magic.patch + URL: http://www.darwinsys.com/file/ Requires: file-libs = %{version}-%{release} BuildRequires: zlib-devel @@ -183,6 +186,7 @@ file(1) command. %patch60 -p1 %patch61 -p1 %patch62 -p1 +%patch63 -p1 # Patches can generate *.orig files, which can't stay in the magic dir, # otherwise there will be problems when compiling magic file! @@ -262,6 +266,9 @@ cd python %endif %changelog +* Mon Nov 18 2019 Kamil Dudka - 5.11-37 +- remove wrong magic for JFFS file system (#1773477) + * Tue Aug 06 2019 Kamil Dudka - 5.11-36 - fix out-of-bounds read via a crafted ELF file (CVE-2018-10360)