com php-src: Fixed bug #75111 (Memory disclosure or DoS via crafted .bmp image): NEWS ext/gd/libgd/gd_bmp.c ext/gd/libgd/gd_io _dp.c
ext/gd/tests/bug75111.phpt

From: Date: Thu, 24 Aug 2017 12:07:10 +0000
Subject: com php-src: Fixed bug #75111 (Memory disclosure or DoS via crafted .bmp image): NEWS ext/gd/libgd/gd_bmp.c ext/gd/libgd/gd_io _dp.c
ext/gd/tests/bug75111.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-99146@lists.php.net to get a copy of this message
Commit: 5cd348c1d606b890abae076a38e47effcfda79be Author: Christoph M. Becker <cmbecker69@gmx.de> Thu, 24 Aug 2017 12:39:45 +0200 Parents: cf6f25bd37f2dc36f1443f07406a89040c50db65 Branches: PHP-7.2 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5cd348c1d606b890abae076a38e47effcfda79be Log: Fixed bug #75111 (Memory disclosure or DoS via crafted .bmp image) Crafted BMP images can cause dynamicSeek() to be called with a negative position which must not be allowed, since dynamicSeek() works like fseek() in SEEK_SET mode. We solve this by bailing out if pos is negative, and let the image reading fail gracefully. Bugs: https://bugs.php.net/75111 Changed paths: M NEWS M ext/gd/libgd/gd_bmp.c M ext/gd/libgd/gd_io_dp.c A ext/gd/tests/bug75111.phpt Diff: diff --git a/NEWS b/NEWS index 312477e..a8e4e94 100644 --- a/NEWS +++ b/NEWS @@ -8,6 +8,9 @@ PHP NEWS - CURL: . Fixed bug #75093 (OpenSSL support not detected). (Remi) +- GD: + . Fixed bug #75111 (Memory disclosure or DoS via crafted .bmp image). (cmb) + - PCRE: . Fixed bug #75089 (preg_grep() is not reporting PREG_BAD_UTF8_ERROR after first input string). (Dmitry) diff --git a/ext/gd/libgd/gd_bmp.c b/ext/gd/libgd/gd_bmp.c index 93a9d61..8af8751 100644 --- a/ext/gd/libgd/gd_bmp.c +++ b/ext/gd/libgd/gd_bmp.c @@ -711,7 +711,9 @@ static int bmp_read_direct(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, b /* There is a chance the data isn't until later, would be wierd but it is possible */ if (gdTell(infile) != header->off) { /* Should make sure we don't seek past the file size */ - gdSeek(infile, header->off); + if (!gdSeek(infile, header->off)) { + return 1; + } } /* The line must be divisible by 4, else its padded with NULLs */ @@ -806,7 +808,9 @@ static int bmp_read_1bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp /* There is a chance the data isn't until later, would be wierd but it is possible */ if (gdTell(infile) != header->off) { /* Should make sure we don't seek past the file size */ - gdSeek(infile, header->off); + if (!gdSeek(infile, header->off)) { + return 1; + } } /* The line must be divisible by 4, else its padded with NULLs */ @@ -874,7 +878,9 @@ static int bmp_read_4bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp /* There is a chance the data isn't until later, would be wierd but it is possible */ if (gdTell(infile) != header->off) { /* Should make sure we don't seek past the file size */ - gdSeek(infile, header->off); + if (!gdSeek(infile, header->off)) { + return 1; + } } /* The line must be divisible by 4, else its padded with NULLs */ @@ -959,7 +965,9 @@ static int bmp_read_8bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp /* There is a chance the data isn't until later, would be wierd but it is possible */ if (gdTell(infile) != header->off) { /* Should make sure we don't seek past the file size */ - gdSeek(infile, header->off); + if (!gdSeek(infile, header->off)) { + return 1; + } } /* The line must be divisible by 4, else its padded with NULLs */ diff --git a/ext/gd/libgd/gd_io_dp.c b/ext/gd/libgd/gd_io_dp.c index 4dcedde..81b9881 100644 --- a/ext/gd/libgd/gd_io_dp.c +++ b/ext/gd/libgd/gd_io_dp.c @@ -152,6 +152,9 @@ static int dynamicSeek (struct gdIOCtx *ctx, const int pos) dynamicPtr *dp; dpIOCtx *dctx; + if (pos < 0) { + return FALSE; + } dctx = (dpIOCtx *) ctx; dp = dctx->dp; diff --git a/ext/gd/tests/bug75111.phpt b/ext/gd/tests/bug75111.phpt new file mode 100644 index 0000000..3950799 --- /dev/null +++ b/ext/gd/tests/bug75111.phpt @@ -0,0 +1,25 @@ +--TEST-- +Bug #75111 (Memory disclosure or DoS via crafted .bmp image) +--SKIPIF-- +<?php +if (!extension_loaded('gd')) die('skip gd extension not available'); +?> +--FILE-- +<?php +// craft BMP image +$str = hex2bin("424D3603000000000000"); +$str .= pack("V", -0x120000); // offset of image data +$str .= pack("V", 40); // length of header +$str .= pack("V", 256); // width +$str .= pack("V", 256); // height +$str .= hex2bin("01001800000000000000000000000000000000000000000000000000"); + +var_dump(imagecreatefromstring($str)); +?> +===DONE=== +--EXPECTF-- +Warning: imagecreatefromstring(): Passed data is not in 'BMP' format in %s on line %d + +Warning: imagecreatefromstring(): Couldn't create GD Image Stream out of Data in %s on line %d +bool(false) +===DONE===

« previous php.cvs (#99146) next »