From 4c918f46c40878ae91d8de4223c6370f8c10ec66 Mon Sep 17 00:00:00 2001 From: Rajkumar Veer Date: Fri, 3 Nov 2017 22:23:27 -0700 Subject: tiff: Security fix for CVE-2017-7592 Signed-off-by: Rajkumar Veer Signed-off-by: Armin Kuster --- .../libtiff/files/CVE-2017-7592.patch | 40 ++++++++++++++++++++++ meta/recipes-multimedia/libtiff/tiff_4.0.7.bb | 3 +- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-multimedia/libtiff/files/CVE-2017-7592.patch diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2017-7592.patch b/meta/recipes-multimedia/libtiff/files/CVE-2017-7592.patch new file mode 100644 index 0000000000..5b80445f31 --- /dev/null +++ b/meta/recipes-multimedia/libtiff/files/CVE-2017-7592.patch @@ -0,0 +1,40 @@ +From 48780b4fcc425cddc4ef8ffdf536f96a0d1b313b Mon Sep 17 00:00:00 2001 +From: erouault +Date: Wed, 11 Jan 2017 16:38:26 +0000 +Subject: [PATCH] * libtiff/tif_getimage.c: add explicit uint32 cast in putagreytile to +avoid UndefinedBehaviorSanitizer warning. +Patch by Nicolas Pena. +Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2658 + +Upstream-Status: Backport +CVE: CVE-2017-7592 +Signed-off-by: Rajkumar Veer + +Index: tiff-4.0.7/ChangeLog +=================================================================== +--- tiff-4.0.7.orig/ChangeLog 2017-04-24 14:25:10.143926025 +0530 ++++ tiff-4.0.7/ChangeLog 2017-04-24 15:20:21.291839230 +0530 +@@ -1,3 +1,10 @@ ++2017-01-11 Even Rouault ++ ++ * libtiff/tif_getimage.c: add explicit uint32 cast in putagreytile to ++ avoid UndefinedBehaviorSanitizer warning. ++ Patch by Nicolas Pena. ++ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2658 ++ + 2016-12-03 Even Rouault + + * libtiff/tif_dirread.c: modify ChopUpSingleUncompressedStrip() to +Index: tiff-4.0.7/libtiff/tif_getimage.c +=================================================================== +--- tiff-4.0.7.orig/libtiff/tif_getimage.c 2016-11-18 08:17:45.000000000 +0530 ++++ tiff-4.0.7/libtiff/tif_getimage.c 2017-04-24 15:17:46.671843283 +0530 +@@ -1305,7 +1305,7 @@ + while (h-- > 0) { + for (x = w; x-- > 0;) + { +- *cp++ = BWmap[*pp][0] & (*(pp+1) << 24 | ~A1); ++ *cp++ = BWmap[*pp][0] & ((uint32)*(pp+1) << 24 | ~A1); + pp += samplesperpixel; + } + cp += toskew; diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.7.bb b/meta/recipes-multimedia/libtiff/tiff_4.0.7.bb index 4efe4c2db6..303eff088b 100644 --- a/meta/recipes-multimedia/libtiff/tiff_4.0.7.bb +++ b/meta/recipes-multimedia/libtiff/tiff_4.0.7.bb @@ -18,7 +18,8 @@ SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \ file://CVE-2016-10267.patch \ file://CVE-2016-10269.patch \ file://CVE-2016-10270.patch \ - " + file://CVE-2017-7592.patch \ + " SRC_URI[md5sum] = "77ae928d2c6b7fb46a21c3a29325157b" SRC_URI[sha256sum] = "9f43a2cfb9589e5cecaa66e16bf87f814c945f22df7ba600d63aac4632c4f019" -- cgit 1.2.3-korg