diff options
| author |   Rajkumar Veer <rveer@mvista.com> | 2017-11-03 22:33:41 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-21 14:42:55 +0000 |
| commit | 12325a8ebb5cab1837a6f6092eaa623a1a784eb6 (patch) | |
| tree | 7381b17981162552270bcab2d0c562fc79d74e52 | |
| parent | ade8551d6a6810e87e83af72ea217aeca55c65c4 (diff) | |
| download | openembedded-core-12325a8ebb5cab1837a6f6092eaa623a1a784eb6.tar.gz | |
tiff: Security fix for CVE-2017-7602
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-7602.patch | 69 | ||||
| -rw-r--r-- | meta/recipes-multimedia/libtiff/tiff_4.0.7.bb | 1 |
2 files changed, 70 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/libtiff/files/CVE-2017-7602.patch b/meta/recipes-multimedia/libtiff/files/CVE-2017-7602.patch new file mode 100644 index 0000000000..9ed97e2467 --- /dev/null +++ b/meta/recipes-multimedia/libtiff/files/CVE-2017-7602.patch @@ -0,0 +1,69 @@ +From 66e7bd59520996740e4df5495a830b42fae48bc4 Mon Sep 17 00:00:00 2001 +From: erouault <erouault> +Date: Wed, 11 Jan 2017 16:33:34 +0000 +Subject: [PATCH] * libtiff/tif_read.c: avoid potential undefined behaviour on + signed integer addition in TIFFReadRawStrip1() in isMapped() case. Fixes + http://bugzilla.maptools.org/show_bug.cgi?id=2650 + +Upstream-Status: Backport + +CVE: CVE-2017-7602 +Signed-off-by: Rajkumar Veer <rveer@mvista.com> + +Index: tiff-4.0.7/ChangeLog +=================================================================== +--- tiff-4.0.7.orig/ChangeLog 2017-04-25 18:42:07.656135638 +0530 ++++ tiff-4.0.7/ChangeLog 2017-04-25 18:54:36.812147299 +0530 +@@ -8,6 +8,12 @@ + + 2017-01-11 Even Rouault <even.rouault at spatialys.com> + ++ * libtiff/tif_read.c: avoid potential undefined behaviour on signed integer ++ addition in TIFFReadRawStrip1() in isMapped() case. ++ Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2650 ++ ++2017-01-11 Even Rouault <even.rouault at spatialys.com> ++ + * libtiff/tif_jpeg.c: validate BitsPerSample in JPEGSetupEncode() to avoid + undefined behaviour caused by invalid shift exponent. + Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2648 +Index: tiff-4.0.7/libtiff/tif_read.c +=================================================================== +--- tiff-4.0.7.orig/libtiff/tif_read.c 2017-04-25 18:42:07.132135629 +0530 ++++ tiff-4.0.7/libtiff/tif_read.c 2017-04-25 18:58:25.272150855 +0530 +@@ -420,16 +420,26 @@ + return ((tmsize_t)(-1)); + } + } else { +- tmsize_t ma,mb; ++ tmsize_t ma; + tmsize_t n; +- ma=(tmsize_t)td->td_stripoffset[strip]; +- mb=ma+size; +- if ((td->td_stripoffset[strip] > (uint64)TIFF_TMSIZE_T_MAX)||(ma>tif->tif_size)) +- n=0; +- else if ((mb<ma)||(mb<size)||(mb>tif->tif_size)) +- n=tif->tif_size-ma; +- else +- n=size; ++ if ((td->td_stripoffset[strip] > (uint64)TIFF_TMSIZE_T_MAX)|| ++ ((ma=(tmsize_t)td->td_stripoffset[strip])>tif->tif_size)) ++ { ++ n=0; ++ } ++ else if( ma > TIFF_TMSIZE_T_MAX - size ) ++ { ++ n=0; ++ } ++ else ++ { ++ tmsize_t mb=ma+size; ++ if (mb>tif->tif_size) ++ n=tif->tif_size-ma; ++ else ++ n=size; ++ } ++ + if (n!=size) { + #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) + TIFFErrorExt(tif->tif_clientdata, module, diff --git a/meta/recipes-multimedia/libtiff/tiff_4.0.7.bb b/meta/recipes-multimedia/libtiff/tiff_4.0.7.bb index 7f438dad9a..126cad13fd 100644 --- a/meta/recipes-multimedia/libtiff/tiff_4.0.7.bb +++ b/meta/recipes-multimedia/libtiff/tiff_4.0.7.bb @@ -25,6 +25,7 @@ SRC_URI = "http://download.osgeo.org/libtiff/tiff-${PV}.tar.gz \ file://CVE-2017-7596.patch \ file://CVE-2017-7598.patch \ file://CVE-2017-7601.patch \ + file://CVE-2017-7602.patch \ " SRC_URI[md5sum] = "77ae928d2c6b7fb46a21c3a29325157b" |