diff options
Diffstat (limited to 'meta/recipes-multimedia/libtiff/files/CVE-2016-5321.patch')
| -rw-r--r-- | meta/recipes-multimedia/libtiff/files/CVE-2016-5321.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2016-5321.patch b/meta/recipes-multimedia/libtiff/files/CVE-2016-5321.patch new file mode 100644 index 0000000000..98538ad057 --- /dev/null +++ b/meta/recipes-multimedia/libtiff/files/CVE-2016-5321.patch @@ -0,0 +1,45 @@ +From d9783e4a1476b6787a51c5ae9e9b3156527589f0 Mon Sep 17 00:00:00 2001 +From: erouault <erouault> +Date: Mon, 11 Jul 2016 21:26:03 +0000 +Subject: [PATCH 1/2] * tools/tiffcrop.c: Avoid access outside of stack + allocated array on a tiled separate TIFF with more than 8 samples per pixel. + Reported by Kaixiang Zhang of the Cloud Security Team, Qihoo 360 + (CVE-2016-5321, bugzilla #2558) + +CVE: CVE-2016-5321 +Upstream-Status: Backport +https://github.com/vadz/libtiff/commit/d9783e4a1476b6787a51c5ae9e9b3156527589f0 + +Signed-off-by: Yi Zhao <yi.zhao@windirver.com> +--- + tools/tiffcrop.c | 2 +- + 2 files changed, 8 insertions(+), 1 deletion(-) + +Index: tiff-4.0.4/tools/tiffcrop.c +=================================================================== +--- tiff-4.0.4.orig/tools/tiffcrop.c ++++ tiff-4.0.4/tools/tiffcrop.c +@@ -989,7 +989,7 @@ static int readSeparateTilesIntoBuffer + nrow = (row + tl > imagelength) ? imagelength - row : tl; + for (col = 0; col < imagewidth; col += tw) + { +- for (s = 0; s < spp; s++) ++ for (s = 0; s < spp && s < MAX_SAMPLES; s++) + { /* Read each plane of a tile set into srcbuffs[s] */ + tbytes = TIFFReadTile(in, srcbuffs[s], col, row, 0, s); + if (tbytes < 0 && !ignore) +Index: tiff-4.0.4/ChangeLog +=================================================================== +--- tiff-4.0.4.orig/ChangeLog ++++ tiff-4.0.4/ChangeLog +@@ -1,3 +1,10 @@ ++2016-07-11 Even Rouault <even.rouault at spatialys.com> ++ ++ * tools/tiffcrop.c: Avoid access outside of stack allocated array ++ on a tiled separate TIFF with more than 8 samples per pixel. ++ Reported by Kaixiang Zhang of the Cloud Security Team, Qihoo 360 ++ (CVE-2016-5321, bugzilla #2558) ++ + 2015-12-26 Even Rouault <even.rouault at spatialys.com> + + * libtiff/tif_getimage.c: fix out-of-bound reads in TIFFRGBAImage |