|
 |
435ea7 |
From 5c9f96799961818944d43b22c241cc56c215c2e4 Mon Sep 17 00:00:00 2001
|
|
|
435ea7 |
From: Remi Collet <remi@php.net>
|
|
|
435ea7 |
Date: Tue, 10 Jun 2014 14:13:14 +0200
|
|
|
435ea7 |
Subject: [PATCH] Fixed Bug #67411 fileinfo: cdf_check_stream_offset
|
|
|
435ea7 |
insufficient boundary check
|
|
|
435ea7 |
|
|
|
435ea7 |
Upstream:
|
|
|
435ea7 |
https://github.com/file/file/commit/36fadd29849b8087af9f4586f89dbf74ea45be67
|
|
|
435ea7 |
---
|
|
|
435ea7 |
ext/fileinfo/libmagic/cdf.c | 6 ++++--
|
|
|
435ea7 |
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
435ea7 |
|
|
|
435ea7 |
diff --git a/ext/fileinfo/libmagic/cdf.c b/ext/fileinfo/libmagic/cdf.c
|
|
|
435ea7 |
index 16649f1..c9a5d50 100644
|
|
|
435ea7 |
--- a/src/cdf.c
|
|
|
435ea7 |
+++ b/src/cdf.c
|
|
|
435ea7 |
@@ -267,13 +267,15 @@ cdf_check_stream_offset(const cdf_stream_t *sst, const cdf_header_t *h,
|
|
|
435ea7 |
{
|
|
|
435ea7 |
const char *b = (const char *)sst->sst_tab;
|
|
|
435ea7 |
const char *e = ((const char *)p) + tail;
|
|
|
435ea7 |
+ size_t ss = sst->sst_dirlen < h->h_min_size_standard_stream ?
|
|
|
435ea7 |
+ CDF_SHORT_SEC_SIZE(h) : CDF_SEC_SIZE(h);
|
|
|
435ea7 |
(void)&line;
|
|
|
435ea7 |
- if (e >= b && (size_t)(e - b) < CDF_SEC_SIZE(h) * sst->sst_len)
|
|
|
435ea7 |
+ if (e >= b && (size_t)(e - b) <= ss * sst->sst_len)
|
|
|
435ea7 |
return 0;
|
|
|
435ea7 |
DPRINTF(("%d: offset begin %p end %p %" SIZE_T_FORMAT "u"
|
|
|
435ea7 |
" >= %" SIZE_T_FORMAT "u [%" SIZE_T_FORMAT "u %"
|
|
|
435ea7 |
SIZE_T_FORMAT "u]\n", line, b, e, (size_t)(e - b),
|
|
|
435ea7 |
- CDF_SEC_SIZE(h) * sst->sst_len, CDF_SEC_SIZE(h), sst->sst_len));
|
|
|
435ea7 |
+ ss * sst->sst_len, ss, sst->sst_len));
|
|
|
435ea7 |
errno = EFTYPE;
|
|
|
435ea7 |
return -1;
|
|
|
435ea7 |
}
|
|
|
435ea7 |
--
|
|
|
435ea7 |
1.9.2
|
|
|
435ea7 |
|