rpms/file
6
0
Fork 0
Code Issues Pull Requests Releases Activity

import file-5.33-20.el8

Browse Source
This commit is contained in:
CentOS Sources 2021-11-09 04:52:29 -05:00 committed by Stepan Oksanichenko
parent 7985fa221b
commit 64aeea1a60
2 changed files with 64 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
SOURCES/file-5.37-CVE-2019-18218.patch Normal file
View File

@ -0,0 +1,52 @@
From f73ad90e797824569008a054bea6c8215883a3a0 Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
Date: Mon, 26 Aug 2019 14:31:39 +0000
Subject: [PATCH] Limit the number of elements in a vector (found by oss-fuzz)
Upstream-commit: 46a8443f76cec4b41ec736eca396984c74664f84
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
---
src/cdf.c | 7 +++----
src/cdf.h | 1 +
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/cdf.c b/src/cdf.c
index 556a3ff..8bb0a6d 100644
--- a/src/cdf.c
+++ b/src/cdf.c
@@ -1013,8 +1013,9 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h,
goto out;
}
nelements = CDF_GETUINT32(q, 1);
- if (nelements == 0) {
- DPRINTF(("CDF_VECTOR with nelements == 0\n"));
+ if (nelements > CDF_ELEMENT_LIMIT || nelements == 0) {
+ DPRINTF(("CDF_VECTOR with nelements == %"
+ SIZE_T_FORMAT "u\n", nelements));
goto out;
}
slen = 2;
@@ -1056,8 +1057,6 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h,
goto out;
inp += nelem;
}
- DPRINTF(("nelements = %" SIZE_T_FORMAT "u\n",
- nelements));
for (j = 0; j < nelements && i < sh.sh_properties;
j++, i++)
{
diff --git a/src/cdf.h b/src/cdf.h
index 2f7e554..0505666 100644
--- a/src/cdf.h
+++ b/src/cdf.h
@@ -48,6 +48,7 @@
typedef int32_t cdf_secid_t;
#define CDF_LOOP_LIMIT 10000
+#define CDF_ELEMENT_LIMIT 100000
#define CDF_SECID_NULL 0
#define CDF_SECID_FREE -1
--
2.20.1

15
SPECS/file.spec
View File

@ -15,7 +15,7 @@
Summary: A utility for determining file types
Name: file
Version: 5.33
Release: 16%{?dist}.1
Release: 20%{?dist}
License: BSD
Group: Applications/File
Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@ -82,6 +82,9 @@ Patch20: file-5.33-more-python.patch
# improve magic for Shell, Gnome Javascript and TCL scripts
Patch21: file-5.33-other-languages.patch
# fix heap-based buffer overflow in cdf_read_property_info() (CVE-2019-18218)
Patch22: file-5.37-CVE-2019-18218.patch
URL: http://www.darwinsys.com/file/
Requires: file-libs = %{version}-%{release}
BuildRequires: zlib-devel
@ -252,8 +255,14 @@ cd %{py3dir}
%endif
%changelog
* Fri Jan 29 2021 Vincent Mihalkovic <vmihalko@redhat.com> - 5.33-16.el8_3.1
- improve magic for script recognition and other changes (#1905906)
* Tue May 04 2021 Vincent Mihalkovic <vmihalko@redhat.com> - 5.33-20
- rebuild (#1954434)
* Wed Apr 14 2021 Vincent Mihalkovic <vmihalko@redhat.com> - 5.33-18
- fix heap-based buffer overflow in cdf_read_property_info() (CVE-2019-18218)
* Thu Jan 21 2021 Vincent Mihalkovic <vmihalko@redhat.com> - 5.33-17
- improve magic for script recognition and other changes (#1903531)
* Mon Jun 22 2020 Vincent Mihalkovic <vmihalko@redhat.com> - 5.33-16
- magic/Magdir/msooxml: Search deeper in the zip file (#1845169)