diff options
| author |   Joe Slater <joe.slater@windriver.com> | 2018-07-12 11:48:17 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-18 10:09:29 +0100 |
| commit | d19a9b41d3b2dcba3b102a8289b7787b4b131e96 (patch) | |
| tree | 86b9caceac30870d9c2d26869640206db979b0fa /meta | |
| parent | 3e3c5cc579482041f0233e3e03ace736b62fb364 (diff) | |
| download | openembedded-core-d19a9b41d3b2dcba3b102a8289b7787b4b131e96.tar.gz | |
tiff: security fix CVE-2018-10963
Denial of service described at https://nvd.nist.gov/vuln/detail/CVE-2018-10963.
Signed-off-by: Joe Slater <joe.slater@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-multimedia/libtiff/files/CVE-2018-10963.patch | 39 | ||||
| -rw-r--r-- | meta/recipes-multimedia/libtiff/tiff_4.0.9.bb | 1 |
2 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2018-10963.patch b/meta/recipes-multimedia/libtiff/files/CVE-2018-10963.patch new file mode 100644 index 0000000000..7252298b52 --- /dev/null +++ b/meta/recipes-multimedia/libtiff/files/CVE-2018-10963.patch @@ -0,0 +1,39 @@ +From de144fd228e4be8aa484c3caf3d814b6fa88c6d9 Mon Sep 17 00:00:00 2001 +From: Even Rouault <even.rouault@spatialys.com> +Date: Sat, 12 May 2018 14:24:15 +0200 +Subject: [PATCH] TIFFWriteDirectorySec: avoid assertion. Fixes + http://bugzilla.maptools.org/show_bug.cgi?id=2795. + CVE-2018-10963 + +--- +CVE: CVE-2018-10963 + +Upstream-Status: Backport [gitlab.com/libtiff/libtiff/commit/de144f...] + +Signed-off-by: Joe Slater <joe.slater@windriver.com> + +--- + libtiff/tif_dirwrite.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/libtiff/tif_dirwrite.c b/libtiff/tif_dirwrite.c +index 2430de6..c15a28d 100644 +--- a/libtiff/tif_dirwrite.c ++++ b/libtiff/tif_dirwrite.c +@@ -695,8 +695,11 @@ TIFFWriteDirectorySec(TIFF* tif, int isimage, int imagedone, uint64* pdiroff) + } + break; + default: +- assert(0); /* we should never get here */ +- break; ++ TIFFErrorExt(tif->tif_clientdata,module, ++ "Cannot write tag %d (%s)", ++ TIFFFieldTag(o), ++ o->field_name ? o->field_name : "unknown"); ++ goto bad; + } + } + } +-- +1.7.9.5 + diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb b/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb index 8c3bba5c64..e8e2a119f1 100644 --- a/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb +++ b/meta/recipes-multimedia/libtiff/tiff_4.0.9.bb @@ -9,6 +9,7 @@ SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \ file://CVE-2017-9935.patch \ file://CVE-2017-18013.patch \ file://CVE-2018-5784.patch \ + file://CVE-2018-10963.patch \ " SRC_URI[md5sum] = "54bad211279cc93eb4fca31ba9bfdc79" |