Blame SOURCES/php-5.4.16-CVE-2014-3710.patch
|
 |
4b401f |
From 1803228597e82218a8c105e67975bc50e6f5bf0d Mon Sep 17 00:00:00 2001
|
|
|
4b401f |
From: Remi Collet <remi@php.net>
|
|
|
4b401f |
Date: Wed, 22 Oct 2014 15:37:04 +0200
|
|
|
4b401f |
Subject: [PATCH] Fix bug #68283: fileinfo: out-of-bounds read in elf note
|
|
|
4b401f |
headers
|
|
|
4b401f |
|
|
|
4b401f |
Upstream commit
|
|
|
4b401f |
https://github.com/file/file/commit/39c7ac1106be844a5296d3eb5971946cc09ffda0
|
|
|
4b401f |
|
|
|
4b401f |
CVE -2014-3710
|
|
|
4b401f |
---
|
|
|
4b401f |
ext/fileinfo/libmagic/readelf.c | 7 +++++++
|
|
|
4b401f |
1 file changed, 7 insertions(+)
|
|
|
4b401f |
|
|
|
4b401f |
diff --git a/ext/fileinfo/libmagic/readelf.c b/ext/fileinfo/libmagic/readelf.c
|
|
|
4b401f |
index 1c3845f..bb6f70f 100644
|
|
|
4b401f |
--- a/ext/fileinfo/libmagic/readelf.c
|
|
|
4b401f |
+++ b/ext/fileinfo/libmagic/readelf.c
|
|
|
4b401f |
@@ -372,6 +372,13 @@ donote(struct magic_set *ms, void *vbuf, size_t offset, size_t size,
|
|
|
4b401f |
uint32_t namesz, descsz;
|
|
|
4b401f |
unsigned char *nbuf = CAST(unsigned char *, vbuf);
|
|
|
4b401f |
|
|
|
4b401f |
+ if (xnh_sizeof + offset > size) {
|
|
|
4b401f |
+ /*
|
|
|
4b401f |
+ * We're out of note headers.
|
|
|
4b401f |
+ */
|
|
|
4b401f |
+ return xnh_sizeof + offset;
|
|
|
4b401f |
+ }
|
|
|
4b401f |
+
|
|
|
4b401f |
(void)memcpy(xnh_addr, &nbuf[offset], xnh_sizeof);
|
|
|
4b401f |
offset += xnh_sizeof;
|
|
|
4b401f |
|
|
|
4b401f |
--
|
|
|
4b401f |
2.1.0
|
|
|
4b401f |
|