Skip to contentSkip to conversation

package/file: bump to version 5.38

PATCH New Fabrice Fontaine 2 participants 2 messages Jan 13, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/file: bump to version 5.38

Remove patches (already in version)

---
 ...ation-overflow-when-computing-sector.patch | 68 -------------------
 ...-of-elements-in-a-vector-found-by-os.patch | 62 -----------------
 package/file/file.hash                        |  6 +-
 package/file/file.mk                          |  2 +-
 4 files changed, 4 insertions(+), 134 deletions(-)
 delete mode 100644 package/file/0001-Detect-multiplication-overflow-when-computing-sector.patch
 delete mode 100644 package/file/0002-Limit-the-number-of-elements-in-a-vector-found-by-os.patch
package/file/0001-Detect-multiplication-overflow-when-computing-sector.patch deleted +0 -68
deleted file mode 100644
index c7ef4f2e0d..0000000000
@@ -1,68 +0,0 @@
-From 06de62c022138f63de9bcd04074491945eaa8662 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <[email protected]>
-Date: Fri, 23 Aug 2019 14:29:14 +0000
-Subject: [PATCH] Detect multiplication overflow when computing sector position
- (found by oss-fuzz)
-
-Fixes CVE-2019-18218
-
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- src/cdf.c | 20 +++++++++++++++++---
- 1 file changed, 17 insertions(+), 3 deletions(-)
-
-diff --git a/src/cdf.c b/src/cdf.c
-index 556a3ff8..9d639674 100644
---- a/src/cdf.c
-+++ b/src/cdf.c
-@@ -35,7 +35,7 @@
- #include "file.h"
- 
- #ifndef lint
--FILE_RCSID("@(#)$File: cdf.c,v 1.114 2019/02/20 02:35:27 christos Exp $")
-+FILE_RCSID("@(#)$File: cdf.c,v 1.115 2019/08/23 14:29:14 christos Exp $")
- #endif
- 
- #include <assert.h>
-@@ -53,6 +53,10 @@ FILE_RCSID("@(#)$File: cdf.c,v 1.114 2019/02/20 02:35:27 christos Exp $")
- #define EFTYPE EINVAL
- #endif
- 
-+#ifndef SIZE_T_MAX
-+#define SIZE_T_MAX CAST(size_t, ~0ULL)
-+#endif
-+
- #include "cdf.h"
- 
- #ifdef CDF_DEBUG
-@@ -405,7 +409,12 @@ cdf_read_sector(const cdf_info_t *info, void *buf, size_t offs, size_t len,
-     const cdf_header_t *h, cdf_secid_t id)
- {
- 	size_t ss = CDF_SEC_SIZE(h);
--	size_t pos = CDF_SEC_POS(h, id);
-+	size_t pos;
-+
-+	if (SIZE_T_MAX / ss < CAST(size_t, id))
-+		return -1;
-+
-+	pos = CDF_SEC_POS(h, id);
- 	assert(ss == len);
- 	return cdf_read(info, CAST(off_t, pos), RCAST(char *, buf) + offs, len);
- }
-@@ -415,7 +424,12 @@ cdf_read_short_sector(const cdf_stream_t *sst, void *buf, size_t offs,
-     size_t len, const cdf_header_t *h, cdf_secid_t id)
- {
- 	size_t ss = CDF_SHORT_SEC_SIZE(h);
--	size_t pos = CDF_SHORT_SEC_POS(h, id);
-+	size_t pos;
-+
-+	if (SIZE_T_MAX / ss < CAST(size_t, id))
-+		return -1;
-+
-+	pos = CDF_SHORT_SEC_POS(h, id);
- 	assert(ss == len);
- 	if (pos + len > CDF_SEC_SIZE(h) * sst->sst_len) {
- 		DPRINTF(("Out of bounds read %" SIZE_T_FORMAT "u > %"
--- 
-2.20.1
-
package/file/0002-Limit-the-number-of-elements-in-a-vector-found-by-os.patch deleted +0 -62

62 lines not on this page · raw message

package/file/file.hash +3 -3
index 241820d0fb..96efaf8483 100644
@@ -1,7 +1,7 @@
 # Locally calculated after verifying signature
-# ftp://ftp.astron.com/pub/file/file-5.37.tar.gz.asc
+# ftp://ftp.astron.com/pub/file/file-5.38.tar.gz.asc
 # using key BE04995BA8F90ED0C0C176C471112AB16CB33B3A
-sha256 e9c13967f7dd339a3c241b7710ba093560b9a33013491318e88e6b8b57bae07f  file-5.37.tar.gz
+sha256 593c2ffc2ab349c5aea0f55fedfe4d681737b6b62376a9b3ad1e77b2cc19fa34  file-5.38.tar.gz
 sha256 0bfa856a9930bddadbef95d1be1cf4e163c0be618e76ea3275caaf255283e274  COPYING
 sha256 4ccb60d623884ef637af4a5bc16b2cb350163e2135e967655837336019a64462  src/mygetopt.h
-sha256 7ac061e1a1c840c4dfa0573aec6f3497676c9295b5ec4190d3576646eb1646bf  src/vasprintf.c
+sha256 58b5932aca6c10f2194290a3b26088ec9ba07ef6b52cc9bb2dd638cc634db6f1  src/vasprintf.c
package/file/file.mk +1 -1
index a13acbc47c..3ae7c85976 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FILE_VERSION = 5.37
+FILE_VERSION = 5.38
 FILE_SITE = ftp://ftp.astron.com/pub/file
 FILE_DEPENDENCIES = host-file zlib
 HOST_FILE_DEPENDENCIES = host-zlib
Signature · 1 line
2.24.1