tiff: fix for Security Advisory CVE-2013-4231

Multiple buffer overflows in libtiff before 4.0.3 allow remote attackers
to cause a denial of service (out-of-bounds write) via a crafted (1)
extension block in a GIF image or (2) GIF raster image to
tools/gif2tiff.c or (3) a long filename for a TIFF image to
tools/rgb2ycbcr.c. NOTE: vectors 1 and 3 are disputed by Red Hat, which
states that the input cannot exceed the allocated buffer size.

http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2013-4231Multiple
buffer overflows in libtiff before 4.0.3 allow remote attackers to cause
a denial of service (out-of-bounds write) via a crafted (1) extension
block in a GIF image or (2) GIF raster image to tools/gif2tiff.c or (3)
a long filename for a TIFF image to tools/rgb2ycbcr.c. NOTE: vectors 1
and 3 are disputed by Red Hat, which states that the input cannot exceed
the allocated buffer size.

http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2013-4231

(From OE-Core rev: 19e6d05161ef9f4e5f7277f6eb35eb5d94ecf629)

Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 46 insertions, 1 deletions

diff --git a/meta/recipes-multimedia/libtiff/files/libtiff-CVE-2013-4231.patch b/meta/recipes-multimedia/libtiff/files/libtiff-CVE-2013-4231.patch
new file mode 100644
index 0000000000..d8d4e961db
--- /dev/null
+++ b/meta/recipes-multimedia/libtiff/files/libtiff-CVE-2013-4231.patch
@@ -0,0 +1,44 @@
+Upstream-Status: Backport
+
+Multiple buffer overflows in libtiff before 4.0.3 allow remote attackers
+to cause a denial of service (out-of-bounds write) via a crafted (1)
+extension block in a GIF image or (2) GIF raster image to
+tools/gif2tiff.c or (3) a long filename for a TIFF image to
+tools/rgb2ycbcr.c. NOTE: vectors 1 and 3 are disputed by Red Hat, which
+states that the input cannot exceed the allocated buffer size.
+
+http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2013-4231Multiple
+buffer overflows in libtiff before 4.0.3 allow remote attackers to cause
+a denial of service (out-of-bounds write) via a crafted (1) extension
+block in a GIF image or (2) GIF raster image to tools/gif2tiff.c or (3)
+a long filename for a TIFF image to tools/rgb2ycbcr.c. NOTE: vectors 1
+and 3 are disputed by Red Hat, which states that the input cannot exceed
+the allocated buffer size.
+
+http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2013-4231
+
+Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
+
+Index: tools/gif2tiff.c
+===================================================================
+RCS file: /cvs/maptools/cvsroot/libtiff/tools/gif2tiff.c,v
+retrieving revision 1.12
+retrieving revision 1.13
+diff -u -r1.12 -r1.13
+--- a/tools/gif2tiff.c  15 Dec 2010 00:22:44 -0000      1.12
++++ b/tools/gif2tiff.c  14 Aug 2013 05:18:53 -0000      1.13
+@@ -1,4 +1,4 @@
+-/* $Id: gif2tiff.c,v 1.12 2010-12-15 00:22:44 faxguy Exp $ */
++/* $Id: gif2tiff.c,v 1.13 2013-08-14 05:18:53 fwarmerdam Exp $ */
+ 
+ /*
+  * Copyright (c) 1990-1997 Sam Leffler
+@@ -333,6 +333,8 @@
+     int status = 1;
+ 
+     datasize = getc(infile);
++    if (datasize > 12)
++       return 0;
+     clear = 1 << datasize;
+     eoi = clear + 1;
+     avail = clear + 2;
diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.3.bb b/meta/recipes-multimedia/libtiff/tiff_4.0.3.bb
index fb9e0bf67d..6483655ccc 100644
--- a/meta/recipes-multimedia/libtiff/tiff_4.0.3.bb
+++ b/meta/recipes-multimedia/libtiff/tiff_4.0.3.bb
@@ -8,7 +8,8 @@ SRC_URI = "ftp://ftp.remotesensing.org/pub/libtiff/tiff-${PV}.tar.gz \
            file://libtiff-CVE-2013-1960.patch \
            file://libtiff-CVE-2013-4232.patch \
            file://libtiff-CVE-2013-4243.patch \
-           file://libtiff-CVE-2013-4244.patch"
+           file://libtiff-CVE-2013-4244.patch \
+           file://libtiff-CVE-2013-4231.patch "
 
 SRC_URI[md5sum] = "051c1068e6a0627f461948c365290410"
 SRC_URI[sha256sum] = "ea1aebe282319537fb2d4d7805f478dd4e0e05c33d0928baba76a7c963684872"