1 From 1803228597e82218a8c105e67975bc50e6f5bf0d Mon Sep 17 00:00:00 2001
2 From: Remi Collet <remi@php.net>
3 Date: Wed, 22 Oct 2014 15:37:04 +0200
4 Subject: [PATCH] Fix bug #68283: fileinfo: out-of-bounds read in elf note
8 https://github.com/file/file/commit/39c7ac1106be844a5296d3eb5971946cc09ffda0
12 ext/fileinfo/libmagic/readelf.c | 7 +++++++
13 1 file changed, 7 insertions(+)
15 diff --git a/ext/fileinfo/libmagic/readelf.c b/ext/fileinfo/libmagic/readelf.c
16 index 1c3845f..bb6f70f 100644
17 --- a/ext/fileinfo/libmagic/readelf.c
18 +++ b/ext/fileinfo/libmagic/readelf.c
19 @@ -372,6 +372,13 @@ donote(struct magic_set *ms, void *vbuf, size_t offset, size_t size,
21 uint32_t namesz, descsz;
23 + if (xnh_sizeof + offset > size) {
25 + * We're out of note headers.
27 + return xnh_sizeof + offset;
30 (void)memcpy(xnh_addr, &nbuf[offset], xnh_sizeof);