com php-src: Fix libmagic buffer overflow issue (CVE-2019-18218): ext/fileinfo/libmagic/cdf.c ext/fileinfo/libmagic/cdf.h
| From: | Stanislav Malyshev | Date: | Sun, 27 Oct 2019 23:30:38 +0000 |
| Subject: | com php-src: Fix libmagic buffer overflow issue (CVE-2019-18218): ext/fileinfo/libmagic/cdf.c ext/fileinfo/libmagic/cdf.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-109095@lists.php.net to get a copy of this message | ||
Commit: 469820048df558040f6dec7c39471ad11e2a7cfb
Author: Stanislav Malyshev <stas@php.net> Sun, 27 Oct 2019 16:30:38 -0700
Parents: 52f049879a1f29bcef432ac1a1d77c84ebaa6c7b
Branches: PHP-7.1 PHP-7.2 PHP-7.3 PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=469820048df558040f6dec7c39471ad11e2a7cfb
Log:
Fix libmagic buffer overflow issue (CVE-2019-18218)
Ported from https://github.com/file/file/commit/46a8443f76cec4b41ec736eca396984c74664f84
Changed paths:
M ext/fileinfo/libmagic/cdf.c
M ext/fileinfo/libmagic/cdf.h
Diff:
diff --git a/ext/fileinfo/libmagic/cdf.c b/ext/fileinfo/libmagic/cdf.c
index 28084fbe447..01af1e4eda9 100644
--- a/ext/fileinfo/libmagic/cdf.c
+++ b/ext/fileinfo/libmagic/cdf.c
@@ -872,8 +872,9 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h,
i, inp[i].pi_id, inp[i].pi_type, q - p, offs));
if (inp[i].pi_type & CDF_VECTOR) {
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;
}
o = 2;
@@ -948,8 +949,6 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h,
*info = inp;
inp = *info + nelem;
}
- DPRINTF(("nelements = %" SIZE_T_FORMAT "u\n",
- nelements));
for (j = 0; j < nelements && i < sh.sh_properties;
j++, i++)
{
diff --git a/ext/fileinfo/libmagic/cdf.h b/ext/fileinfo/libmagic/cdf.h
index 9006a686efe..6ad5bceb75d 100644
--- a/ext/fileinfo/libmagic/cdf.h
+++ b/ext/fileinfo/libmagic/cdf.h
@@ -50,6 +50,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