emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unzip: sanitize filename length: malloc(1234mb) is not funny

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-07-20 20:21:50 +02:00
parent 997ad2c64a
commit ad37abf423
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
archival/unzip.c
View File

@ -318,6 +318,12 @@ static uint32_t read_next_cdf(uint32_t cdf_offset, cdf_header_t *cdf)
}; };
#endif #endif
static void die_if_bad_fnamesize(unsigned sz)
{
if (sz > 0xfff) /* more than 4k?! no funny business please */
bb_error_msg_and_die("bad archive");
}
static void unzip_skip(off_t skip) static void unzip_skip(off_t skip)
{ {
if (skip != 0) if (skip != 0)
@ -340,8 +346,7 @@ static void unzip_extract_symlink(zip_header_t *zip, const char *dst_fn)
{ {
char *target; char *target;
if (zip->fmt.ucmpsize > 0xfff) /* no funny business please */ die_if_bad_fnamesize(zip->fmt.ucmpsize);
bb_error_msg_and_die("bad archive");
if (zip->fmt.method == 0) { if (zip->fmt.method == 0) {
/* Method 0 - stored (not compressed) */ /* Method 0 - stored (not compressed) */
@ -784,6 +789,7 @@ int unzip_main(int argc, char **argv)
/* Read filename */ /* Read filename */
free(dst_fn); free(dst_fn);
die_if_bad_fnamesize(zip.fmt.filename_len);
dst_fn = xzalloc(zip.fmt.filename_len + 1); dst_fn = xzalloc(zip.fmt.filename_len + 1);
xread(zip_fd, dst_fn, zip.fmt.filename_len); xread(zip_fd, dst_fn, zip.fmt.filename_len);
/* Skip extra header bytes */ /* Skip extra header bytes */