[PATCH 2/2] gnu: openjpeg-2.*: Fix CVE-2016-5157.

[Leo Famulari]

* gnu/packages/patches/openjpeg-CVE-2016-5157.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/image.scm (openjpeg, openjpeg-2.0): Use it.
---
 gnu/local.mk                                      |  1 +
 gnu/packages/image.scm                            |  2 +
 gnu/packages/patches/openjpeg-CVE-2016-5157.patch | 98 +++++++++++++++++++++++
 3 files changed, 101 insertions(+)
 create mode 100644 gnu/packages/patches/openjpeg-CVE-2016-5157.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 668c9b2..6f887c0 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -702,6 +702,7 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/ocaml-findlib-make-install.patch        \
   %D%/packages/patches/openexr-missing-samples.patch           \
   %D%/packages/patches/openjpeg-CVE-2015-6581.patch            \
+  %D%/packages/patches/openjpeg-CVE-2016-5157.patch            \
   %D%/packages/patches/openjpeg-CVE-2016-7163.patch            \
   %D%/packages/patches/openjpeg-use-after-free-fix.patch       \
   %D%/packages/patches/openssl-runpath.patch                   \
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 64bc05d..b7e873b 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -388,6 +388,7 @@ work.")
          (base32 "00zzm303zvv4ijzancrsb1cqbph3pgz0nky92k9qx3fq9y0vnchj"))
         (patches (search-patches "openjpeg-use-after-free-fix.patch"
                                  "openjpeg-CVE-2015-6581.patch"
+                                 "openjpeg-CVE-2016-5157.patch"
                                  "openjpeg-CVE-2016-7163.patch"))))
     (build-system cmake-build-system)
     (arguments
@@ -426,6 +427,7 @@ error-resilience, a Java-viewer for j2k-images, ...")
         (base32 "1c2xc3nl2mg511b63rk7hrckmy14681p1m44mzw3n1fyqnjm0b0z"))
        (patches (search-patches "openjpeg-use-after-free-fix.patch"
                                 "openjpeg-CVE-2015-6581.patch"
+                                "openjpeg-CVE-2016-5157.patch"
                                 "openjpeg-CVE-2016-7163.patch"))))))
 
 (define-public openjpeg-1
diff --git a/gnu/packages/patches/openjpeg-CVE-2016-5157.patch 
b/gnu/packages/patches/openjpeg-CVE-2016-5157.patch
new file mode 100644
index 0000000..47502df
--- /dev/null
+++ b/gnu/packages/patches/openjpeg-CVE-2016-5157.patch
@@ -0,0 +1,98 @@
+Fix CVE-2016-5157 (heap overflow in opj_dwt_interleave_v() allowing execution 
of
+arbitrary code):
+
+https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-5157
+https://pdfium.googlesource.com/pdfium/+/b6befb2ed2485a3805cddea86dc7574510178ea9
+http://seclists.org/oss-sec/2016/q3/441
+
+Copied from upstream source repository:
+
+https://github.com/uclouvain/openjpeg/commit/e078172b1c3f98d2219c37076b238fb759c751ea
+
+From e078172b1c3f98d2219c37076b238fb759c751ea Mon Sep 17 00:00:00 2001
+From: Matthieu Darbois <address@hidden>
+Date: Thu, 8 Sep 2016 00:24:15 +0200
+Subject: [PATCH] Add sanity check for tile coordinates (#823)
+
+Coordinates are casted from OPJ_UINT32 to OPJ_INT32
+Add sanity check for negative values and upper bound becoming lower
+than lower bound.
+See also
+https://pdfium.googlesource.com/pdfium/+/b6befb2ed2485a3805cddea86dc7574510178ea9
+---
+ src/lib/openjp2/tcd.c                   | 11 +++++++++++
+ tests/compare_dump_files.c              | 14 +++++++-------
+ tests/nonregression/test_suite.ctest.in |  3 +++
+ 3 files changed, 21 insertions(+), 7 deletions(-)
+
+diff --git a/src/lib/openjp2/tcd.c b/src/lib/openjp2/tcd.c
+index 12da05c..7a29c49 100644
+--- a/src/lib/openjp2/tcd.c
++++ b/src/lib/openjp2/tcd.c
+@@ -696,9 +696,20 @@ static INLINE OPJ_BOOL opj_tcd_init_tile(opj_tcd_t 
*p_tcd, OPJ_UINT32 p_tile_no,
+       l_tx0 = l_cp->tx0 + p * l_cp->tdx; /* can't be greater than l_image->x1 
so won't overflow */
+       l_tile->x0 = (OPJ_INT32)opj_uint_max(l_tx0, l_image->x0);
+       l_tile->x1 = (OPJ_INT32)opj_uint_min(opj_uint_adds(l_tx0, l_cp->tdx), 
l_image->x1);
++      /* all those OPJ_UINT32 are casted to OPJ_INT32, let's do some sanity 
check */
++      if ((l_tile->x0 < 0) || (l_tile->x1 <= l_tile->x0)) {
++              opj_event_msg(manager, EVT_ERROR, "Tile X coordinates are not 
supported\n");
++              return OPJ_FALSE;
++      }
+       l_ty0 = l_cp->ty0 + q * l_cp->tdy; /* can't be greater than l_image->y1 
so won't overflow */
+       l_tile->y0 = (OPJ_INT32)opj_uint_max(l_ty0, l_image->y0);
+       l_tile->y1 = (OPJ_INT32)opj_uint_min(opj_uint_adds(l_ty0, l_cp->tdy), 
l_image->y1);
++      /* all those OPJ_UINT32 are casted to OPJ_INT32, let's do some sanity 
check */
++      if ((l_tile->y0 < 0) || (l_tile->y1 <= l_tile->y0)) {
++              opj_event_msg(manager, EVT_ERROR, "Tile Y coordinates are not 
supported\n");
++              return OPJ_FALSE;
++      }
++      
+ 
+       /* testcase 1888.pdf.asan.35.988 */
+       if (l_tccp->numresolutions == 0) {
+diff --git a/tests/compare_dump_files.c b/tests/compare_dump_files.c
+index 946c92a..7d22270 100644
+--- a/tests/compare_dump_files.c
++++ b/tests/compare_dump_files.c
+@@ -118,10 +118,10 @@ int main(int argc, char **argv)
+   test_cmp_parameters inParam;
+   FILE *fbase=NULL, *ftest=NULL;
+   int same = 0;
+-  char lbase[256];
+-  char strbase[256];
+-  char ltest[256];
+-  char strtest[256];
++  char lbase[512];
++  char strbase[512];
++  char ltest[512];
++  char strtest[512];
+ 
+   if( parse_cmdline_cmp(argc, argv, &inParam) == 1 )
+     {
+@@ -154,9 +154,9 @@ int main(int argc, char **argv)
+ 
+   while (fgets(lbase, sizeof(lbase), fbase) && 
fgets(ltest,sizeof(ltest),ftest))
+     {
+-    int nbase = sscanf(lbase, "%255[^\r\n]", strbase);
+-    int ntest = sscanf(ltest, "%255[^\r\n]", strtest);
+-    assert( nbase != 255 && ntest != 255 );
++    int nbase = sscanf(lbase, "%511[^\r\n]", strbase);
++    int ntest = sscanf(ltest, "%511[^\r\n]", strtest);
++    assert( nbase != 511 && ntest != 511 );
+     if( nbase != 1 || ntest != 1 )
+       {
+       fprintf(stderr, "could not parse line from files\n" );
+diff --git a/tests/nonregression/test_suite.ctest.in 
b/tests/nonregression/test_suite.ctest.in
+index bbf1e77..2dfabfb 100644
+--- a/tests/nonregression/test_suite.ctest.in
++++ b/tests/nonregression/test_suite.ctest.in
+@@ -566,3 +566,6 @@ opj_decompress -i @INPUT_NR_PATH@/issue726.j2k -o 
@TEMP_PATH@/issue726.png
+ !opj_decompress -i @INPUT_NR_PATH@/issue775-2.j2k -o 
@TEMP_PATH@/issue775-2.png
+ # issue 818
+ opj_decompress -i @INPUT_NR_PATH@/issue818.jp2 -o @TEMP_PATH@/issue818.png
++# issue 823 (yes, not a typo, test image is issue822)
++!opj_decompress -i @INPUT_NR_PATH@/issue822.jp2 -o @TEMP_PATH@/issue822.png
++
+-- 
+2.10.0
+
-- 
2.10.0