aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRajkumar Veer <rveer@mvista.com>2017-11-03 22:27:08 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-05 22:39:26 +0000
commit7af2f595a595533356ddef42e542825faab3382a (patch)
treeacb2e90b0bb6430365898ddc3f21ae7e51204aae
parentac828e5620430cff207ac5dc14dc5e2dbf99f9de (diff)
downloadopenembedded-core-7af2f595a595533356ddef42e542825faab3382a.zip
openembedded-core-7af2f595a595533356ddef42e542825faab3382a.tar.gz
openembedded-core-7af2f595a595533356ddef42e542825faab3382a.tar.bz2
tiff: Security fix for CVE-2017-7595
Signed-off-by: Rajkumar Veer <rveer@mvista.com> Signed-off-by: Armin Kuster <akuster@mvista.com>
-rw-r--r--meta/recipes-multimedia/libtiff/files/CVE-2017-7595.patch48
-rw-r--r--meta/recipes-multimedia/libtiff/tiff_4.0.7.bb1
2 files changed, 49 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2017-7595.patch b/meta/recipes-multimedia/libtiff/files/CVE-2017-7595.patch
new file mode 100644
index 0000000..851a37f
--- /dev/null
+++ b/meta/recipes-multimedia/libtiff/files/CVE-2017-7595.patch
@@ -0,0 +1,48 @@
+commit 618d490090bfd10e613ac574ecff31a293904b44
+Author: erouault <erouault>
+Date: Wed Jan 11 12:15:01 2017 +0000
+
+ * libtiff/tif_jpeg.c: avoid integer division by zero
+ in JPEGSetupEncode() when horizontal or vertical sampling is set to 0.
+ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2653
+
+Upstream-Status: Backport
+
+CVE: CVE-2017-7595
+Signed-off-by: Rajkumar Veer <rveer@mvista.com>
+
+Index: tiff-4.0.7/ChangeLog
+===================================================================
+--- tiff-4.0.7.orig/ChangeLog 2017-04-24 17:31:40.013832807 +0530
++++ tiff-4.0.7/ChangeLog 2017-04-24 18:03:34.769782616 +0530
+@@ -8,6 +8,12 @@
+
+ 2017-01-11 Even Rouault <even.rouault at spatialys.com>
+
++ * libtiff/tif_jpeg.c: avoid integer division by zero in
++ JPEGSetupEncode() when horizontal or vertical sampling is set to 0.
++ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2653
++
++2017-01-11 Even Rouault <even.rouault at spatialys.com>
++
+ * libtiff/tif_getimage.c: add explicit uint32 cast in putagreytile to
+ avoid UndefinedBehaviorSanitizer warning.
+ Patch by Nicolas Pena.
+Index: tiff-4.0.7/libtiff/tif_jpeg.c
+===================================================================
+--- tiff-4.0.7.orig/libtiff/tif_jpeg.c 2016-01-24 21:09:51.781641625 +0530
++++ tiff-4.0.7/libtiff/tif_jpeg.c 2017-04-24 18:05:59.777778815 +0530
+@@ -1626,6 +1626,13 @@
+ case PHOTOMETRIC_YCBCR:
+ sp->h_sampling = td->td_ycbcrsubsampling[0];
+ sp->v_sampling = td->td_ycbcrsubsampling[1];
++ if( sp->h_sampling == 0 || sp->v_sampling == 0 )
++ {
++ TIFFErrorExt(tif->tif_clientdata, module,
++ "Invalig horizontal/vertical sampling value");
++ return (0);
++ }
++
+ /*
+ * A ReferenceBlackWhite field *must* be present since the
+ * default value is inappropriate for YCbCr. Fill in the
diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.7.bb b/meta/recipes-multimedia/libtiff/tiff_4.0.7.bb
index 12ab936..6881c24 100644
--- a/meta/recipes-multimedia/libtiff/tiff_4.0.7.bb
+++ b/meta/recipes-multimedia/libtiff/tiff_4.0.7.bb
@@ -21,6 +21,7 @@ SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \
file://CVE-2017-7592.patch \
file://CVE-2017-7594-p1.patch \
file://CVE-2017-7594-p2.patch \
+ file://CVE-2017-7595.patch \
"
SRC_URI[md5sum] = "77ae928d2c6b7fb46a21c3a29325157b"