summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/libtiff/files/CVE-2016-3623.patch52
-rw-r--r--meta/recipes-multimedia/libtiff/tiff_4.0.6.bb1
2 files changed, 53 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2016-3623.patch b/meta/recipes-multimedia/libtiff/files/CVE-2016-3623.patch
new file mode 100644
index 0000000000..f554ac5464
--- /dev/null
+++ b/meta/recipes-multimedia/libtiff/files/CVE-2016-3623.patch
@@ -0,0 +1,52 @@
1From bd024f07019f5d9fea236675607a69f74a66bc7b Mon Sep 17 00:00:00 2001
2From: erouault <erouault>
3Date: Mon, 15 Aug 2016 21:26:56 +0000
4Subject: [PATCH] * tools/rgb2ycbcr.c: validate values of -v and -h parameters
5 to avoid potential divide by zero. Fixes CVE-2016-3623 (bugzilla #2569)
6
7CVE: CVE-2016-3623
8Upstream-Status: Backport
9https://github.com/vadz/libtiff/commit/bd024f07019f5d9fea236675607a69f74a66bc7b
10
11Signed-off-by: Yi Zhao <yi.zhao@windirver.com>
12---
13 ChangeLog | 5 +++++
14 tools/rgb2ycbcr.c | 4 ++++
15 2 files changed, 9 insertions(+)
16
17diff --git a/ChangeLog b/ChangeLog
18index 5d60608..3e6642a 100644
19--- a/ChangeLog
20+++ b/ChangeLog
21@@ -1,5 +1,10 @@
22 2016-08-15 Even Rouault <even.rouault at spatialys.com>
23
24+ * tools/rgb2ycbcr.c: validate values of -v and -h parameters to
25+ avoid potential divide by zero. Fixes CVE-2016-3623 (bugzilla #2569)
26+
27+2016-08-15 Even Rouault <even.rouault at spatialys.com>
28+
29 * tools/tiffcrop.c: Fix out-of-bounds write in loadImage().
30 From patch libtiff-CVE-2016-3991.patch from
31 libtiff-4.0.3-25.el7_2.src.rpm by Nikola Forro (bugzilla #2543)
32diff --git a/tools/rgb2ycbcr.c b/tools/rgb2ycbcr.c
33index 3829d6b..51f4259 100644
34--- a/tools/rgb2ycbcr.c
35+++ b/tools/rgb2ycbcr.c
36@@ -95,9 +95,13 @@ main(int argc, char* argv[])
37 break;
38 case 'h':
39 horizSubSampling = atoi(optarg);
40+ if( horizSubSampling != 1 && horizSubSampling != 2 && horizSubSampling != 4 )
41+ usage(-1);
42 break;
43 case 'v':
44 vertSubSampling = atoi(optarg);
45+ if( vertSubSampling != 1 && vertSubSampling != 2 && vertSubSampling != 4 )
46+ usage(-1);
47 break;
48 case 'r':
49 rowsperstrip = atoi(optarg);
50--
512.7.4
52
diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb b/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
index 713cf24d5b..466dfbb50d 100644
--- a/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
+++ b/meta/recipes-multimedia/libtiff/tiff_4.0.6.bb
@@ -13,6 +13,7 @@ SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \
13 file://CVE-2016-3945.patch \ 13 file://CVE-2016-3945.patch \
14 file://CVE-2016-3990.patch \ 14 file://CVE-2016-3990.patch \
15 file://CVE-2016-3991.patch \ 15 file://CVE-2016-3991.patch \
16 file://CVE-2016-3623.patch \
16 " 17 "
17 18
18SRC_URI[md5sum] = "d1d2e940dea0b5ad435f21f03d96dd72" 19SRC_URI[md5sum] = "d1d2e940dea0b5ad435f21f03d96dd72"