diff options
| author | delphij <delphij@FreeBSD.org> | 2015-10-29 17:51:48 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2015-10-29 17:51:48 +0000 |
| commit | e6f47aa69657cac8d80c4361b92a4443b7540770 (patch) | |
| tree | 676076923b2c91d1a095619e5e8501d3d1d1b13d /contrib/file/src/readelf.c | |
| parent | 0528cc36312cf19f8a6e72069d7287150a69b514 (diff) | |
| download | FreeBSD-src-e6f47aa69657cac8d80c4361b92a4443b7540770.zip FreeBSD-src-e6f47aa69657cac8d80c4361b92a4443b7540770.tar.gz | |
MFC r287453,287454,288143:
file 5.25.
Relnotes: yes
Diffstat (limited to 'contrib/file/src/readelf.c')
| -rw-r--r-- | contrib/file/src/readelf.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/contrib/file/src/readelf.c b/contrib/file/src/readelf.c index 55009e8..2a7fc01 100644 --- a/contrib/file/src/readelf.c +++ b/contrib/file/src/readelf.c @@ -27,7 +27,7 @@ #include "file.h" #ifndef lint -FILE_RCSID("@(#)$File: readelf.c,v 1.119 2015/04/09 20:01:41 christos Exp $") +FILE_RCSID("@(#)$File: readelf.c,v 1.122 2015/09/10 13:59:32 christos Exp $") #endif #ifdef BUILTIN_ELF @@ -1048,15 +1048,28 @@ doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num, break; } + /* Things we can determine when we seek */ switch (xsh_type) { case SHT_NOTE: + if ((uintmax_t)(xsh_size + xsh_offset) > + (uintmax_t)fsize) { + if (file_printf(ms, + ", note offset/size 0x%" INTMAX_T_FORMAT + "x+0x%" INTMAX_T_FORMAT "x exceeds" + " file size 0x%" INTMAX_T_FORMAT "x", + (uintmax_t)xsh_offset, (uintmax_t)xsh_size, + (uintmax_t)fsize) == -1) + return -1; + return 0; + } if ((nbuf = malloc(xsh_size)) == NULL) { file_error(ms, errno, "Cannot allocate memory" " for note"); return -1; } - if (pread(fd, nbuf, xsh_size, xsh_offset) < (ssize_t)xsh_size) { + if (pread(fd, nbuf, xsh_size, xsh_offset) < + (ssize_t)xsh_size) { file_badread(ms); free(nbuf); return -1; |
