[gnome-continuous-yocto/gnomeostree-3.22-krogoth: 201/246] tiff: Security fix CVE-2016-3632

[Emmanuele Bassi <ebassi src gnome org>]

commit 3c61ee2f681c0fc2308935ee2fa75b1f037ad752
Author: Yi Zhao <yi zhao windriver com>
Date:   Thu Nov 17 16:08:10 2016 +0800

    tiff: Security fix CVE-2016-3632
    
    CVE-2016-3632 libtiff: The _TIFFVGetField function in tif_dirinfo.c in
    LibTIFF 4.0.6 and earlier allows remote attackers to cause a denial of
    service (out-of-bounds write) or execute arbitrary code via a crafted
    TIFF image.
    
    External References:
    https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-3632
    http://bugzilla.maptools.org/show_bug.cgi?id=2549
    https://bugzilla.redhat.com/show_bug.cgi?id=1325095
    
    The patch is from RHEL7.
    
    (From OE-Core rev: 9206c86239717718be840a32724fd1c190929370)
    
    (From OE-Core rev: 0c6928f4129e5b1e24fa2d42279353e9d15d39f0)
    
    (From OE-Core rev: f10cef0119c3bcf5b23a142f131a2d452ef2b837)
    
    Signed-off-by: Yi Zhao <yi zhao windriver com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
    Signed-off-by: Armin Kuster <akuster808 gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
    Signed-off-by: Armin Kuster <akuster808 gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../libtiff/files/CVE-2016-3632.patch              |   34 ++++++++++++++++++++
 meta/recipes-multimedia/libtiff/tiff_4.0.6.bb      |    1 +
 2 files changed, 35 insertions(+), 0 deletions(-)
---
diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2016-3632.patch 
b/meta/recipes-multimedia/libtiff/files/CVE-2016-3632.patch
new file mode 100644
index 0000000..a839250
--- /dev/null
+++ b/meta/recipes-multimedia/libtiff/files/CVE-2016-3632.patch
@@ -0,0 +1,34 @@
+From d3f9829a37661749b200760ad6525f77cf77d77a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro redhat com>
+Date: Mon, 11 Jul 2016 16:04:34 +0200
+Subject: [PATCH 4/8] Fix CVE-2016-3632
+
+CVE-2016-3632 libtiff: The _TIFFVGetField function in tif_dirinfo.c in
+LibTIFF 4.0.6 and earlier allows remote attackers to cause a denial of service
+(out-of-bounds write) or execute arbitrary code via a crafted TIFF image.
+
+CVE: CVE-2016-3632
+Upstream-Status: Backport [RedHat RHEL7]
+
+Signed-off-by: Yi Zhao <yi zhao windirver com>
+---
+ tools/thumbnail.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tools/thumbnail.c b/tools/thumbnail.c
+index fd1cba5..75e7009 100644
+--- a/tools/thumbnail.c
++++ b/tools/thumbnail.c
+@@ -253,7 +253,8 @@ static struct cpTag {
+     { TIFFTAG_WHITEPOINT,             2, TIFF_RATIONAL },
+     { TIFFTAG_PRIMARYCHROMATICITIES,  (uint16) -1,TIFF_RATIONAL },
+     { TIFFTAG_HALFTONEHINTS,          2, TIFF_SHORT },
+-    { TIFFTAG_BADFAXLINES,            1, TIFF_LONG },
++    // disable BADFAXLINES, CVE-2016-3632
++    //{ TIFFTAG_BADFAXLINES,          1, TIFF_LONG },
+     { TIFFTAG_CLEANFAXDATA,           1, TIFF_SHORT },
+     { TIFFTAG_CONSECUTIVEBADFAXLINES, 1, TIFF_LONG },
+     { TIFFTAG_INKSET,                 1, TIFF_SHORT },
+-- 
+2.7.4
+
diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb b/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
index edd560f..9b4aff3 100644
--- a/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
+++ b/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
@@ -16,6 +16,7 @@ SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \
            file://CVE-2016-3623.patch \
            file://CVE-2016-3622.patch \
            file://CVE-2016-3658.patch \
+           file://CVE-2016-3632.patch \
           "
 
 SRC_URI[md5sum] = "d1d2e940dea0b5ad435f21f03d96dd72"