From ca6970603799c2c9f90582f3f96a32a59dd8a46b Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Mon, 18 Nov 2019 11:39:19 +0100 Subject: [PATCH] Resolves: #1771242 - remove wrong magic for JFFS file system --- file-5.37-jffs-magic.patch | 40 ++++++++++++++++++++++++++++++++++++++ file.spec | 8 +++++++- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 file-5.37-jffs-magic.patch diff --git a/file-5.37-jffs-magic.patch b/file-5.37-jffs-magic.patch new file mode 100644 index 0000000..1c25151 --- /dev/null +++ b/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 +@@ -2057,10 +2057,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 +@@ -2144,7 +2140,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/file.spec b/file.spec index dd86adc..493822e 100644 --- a/file.spec +++ b/file.spec @@ -15,7 +15,7 @@ Summary: A utility for determining file types Name: file Version: 5.37 -Release: 8%{?dist} +Release: 9%{?dist} License: BSD Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -26,6 +26,9 @@ Patch0: file-localmagic.patch Patch1: file-4.17-rpm-name.patch Patch2: file-5.04-volume_key.patch +# remove wrong magic for JFFS file system (#1771242) +Patch5: file-5.37-jffs-magic.patch + # fix double free on read error (#1685217) Patch14: file-5.37-double-free.patch @@ -206,6 +209,9 @@ cd %{py3dir} %endif %changelog +* Mon Nov 18 2019 Kamil Dudka - 5.37-9 +- remove wrong magic for JFFS file system (#1771242) + * Fri Oct 25 2019 Kamil Dudka - 5.37-8 - fix heap-based buffer overflow in cdf_read_property_info() (CVE-2019-18218)