[PATCH 0/2] OpenJPEG security fixes (CVE-2016-{5157,7163})

[PATCH 0/2] OpenJPEG security fixes (CVE-2016-{5157,7163})

[Leo Famulari]

Two bugs disclosed in OpenJPEG, CVE-2016-5157 and CVE-2016-7163. Both
can be used to execute arbitrary code, apparently.

CVE-2016-7163:
http://seclists.org/oss-sec/2016/q3/442

CVE-2016-5157:
http://seclists.org/oss-sec/2016/q3/441

Leo Famulari (2):
  gnu: openjpeg-2.*: Fix CVE-2016-7163.
  gnu: openjpeg-2.*: Fix CVE-2016-5157.

 gnu/local.mk                                      |  2 +
 gnu/packages/image.scm                            |  8 +-
 gnu/packages/patches/openjpeg-CVE-2016-5157.patch | 98 +++++++++++++++++++++++
 gnu/packages/patches/openjpeg-CVE-2016-7163.patch | 71 ++++++++++++++++
 4 files changed, 177 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/openjpeg-CVE-2016-5157.patch
 create mode 100644 gnu/packages/patches/openjpeg-CVE-2016-7163.patch

-- 
2.10.0

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

[Leo Famulari]

* gnu/packages/patches/openjpeg-CVE-2016-7163.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                            |  6 +-
 gnu/packages/patches/openjpeg-CVE-2016-7163.patch | 71 +++++++++++++++++++++++
 3 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/openjpeg-CVE-2016-7163.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 8b042d5..668c9b2 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-7163.patch		\
   %D%/packages/patches/openjpeg-use-after-free-fix.patch	\
   %D%/packages/patches/openssl-runpath.patch			\
   %D%/packages/patches/openssl-1.1.0-c-rehash-in.patch		\
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index a65bf39..64bc05d 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -387,7 +387,8 @@ work.")
         (sha256
          (base32 "00zzm303zvv4ijzancrsb1cqbph3pgz0nky92k9qx3fq9y0vnchj"))
         (patches (search-patches "openjpeg-use-after-free-fix.patch"
-                                 "openjpeg-CVE-2015-6581.patch"))))
+                                 "openjpeg-CVE-2015-6581.patch"
+                                 "openjpeg-CVE-2016-7163.patch"))))
     (build-system cmake-build-system)
     (arguments
       ;; Trying to run `$ make check' results in a no rule fault.
@@ -424,7 +425,8 @@ error-resilience, a Java-viewer for j2k-images, ...")
        (sha256
         (base32 "1c2xc3nl2mg511b63rk7hrckmy14681p1m44mzw3n1fyqnjm0b0z"))
        (patches (search-patches "openjpeg-use-after-free-fix.patch"
-                                "openjpeg-CVE-2015-6581.patch"))))))
+                                "openjpeg-CVE-2015-6581.patch"
+                                "openjpeg-CVE-2016-7163.patch"))))))
 
 (define-public openjpeg-1
   (package (inherit openjpeg)
diff --git a/gnu/packages/patches/openjpeg-CVE-2016-7163.patch b/gnu/packages/patches/openjpeg-CVE-2016-7163.patch
new file mode 100644
index 0000000..68cf7b9
--- /dev/null
+++ b/gnu/packages/patches/openjpeg-CVE-2016-7163.patch
@@ -0,0 +1,71 @@
+Fix CVE-2016-7613 (Integer overflow in opj_pi_create_decode allowing execution
+of arbitrary code):
+
+https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-7163
+https://github.com/uclouvain/openjpeg/issues/826
+http://seclists.org/oss-sec/2016/q3/442
+
+Copied from upstream repository:
+
+https://github.com/uclouvain/openjpeg/commit/c16bc057ba3f125051c9966cf1f5b68a05681de4
+https://github.com/uclouvain/openjpeg/commit/ef01f18dfc6780b776d0674ed3e7415c6ef54d24
+
+From ef01f18dfc6780b776d0674ed3e7415c6ef54d24 Mon Sep 17 00:00:00 2001
+From: Matthieu Darbois <mayeut@users.noreply.github.com>
+Date: Thu, 8 Sep 2016 07:34:46 +0200
+Subject: [PATCH] Cast to size_t before multiplication
+
+Prevent an integer overflow issue in function opj_pi_create_decode of
+pi.c.
+---
+ src/lib/openjp2/pi.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/openjp2/pi.c b/src/lib/openjp2/pi.c
+index cffad66..36e2ff0 100644
+--- a/src/lib/openjp2/pi.c
++++ b/src/lib/openjp2/pi.c
+@@ -1237,7 +1237,13 @@ opj_pi_iterator_t *opj_pi_create_decode(opj_image_t *p_image,
+ 	l_current_pi = l_pi;
+ 
+ 	/* memory allocation for include */
+-	l_current_pi->include = (OPJ_INT16*) opj_calloc((l_tcp->numlayers +1) * l_step_l, sizeof(OPJ_INT16));
++	/* prevent an integer overflow issue */
++	l_current_pi->include = 00;
++	if (l_step_l <= (SIZE_MAX / (l_tcp->numlayers + 1U)))
++	{
++		l_current_pi->include = (OPJ_INT16*) opj_calloc((l_tcp->numlayers +1) * l_step_l, sizeof(OPJ_INT16));
++	}
++
+ 	if
+ 		(!l_current_pi->include)
+ 	{
+-- 
+2.10.0
+
+Need to cast to size_t before multiplication otherwise overflow check is useless.
+---
+ src/lib/openjp2/pi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/openjp2/pi.c b/src/lib/openjp2/pi.c
+index 36e2ff0..809b33d 100644
+--- a/src/lib/openjp2/pi.c
++++ b/src/lib/openjp2/pi.c
+@@ -1241,7 +1241,7 @@ opj_pi_iterator_t *opj_pi_create_decode(opj_image_t *p_image,
+ 	l_current_pi->include = 00;
+ 	if (l_step_l <= (SIZE_MAX / (l_tcp->numlayers + 1U)))
+ 	{
+-		l_current_pi->include = (OPJ_INT16*) opj_calloc((l_tcp->numlayers +1) * l_step_l, sizeof(OPJ_INT16));
++		l_current_pi->include = (OPJ_INT16*) opj_calloc((size_t)(l_tcp->numlayers + 1U) * l_step_l, sizeof(OPJ_INT16));
+ 	}
+ 
+ 	if
+-- 
+2.10.0
+
+From c16bc057ba3f125051c9966cf1f5b68a05681de4 Mon Sep 17 00:00:00 2001
+From: trylab <trylab@users.noreply.github.com>
+Date: Tue, 6 Sep 2016 13:55:49 +0800
+Subject: [PATCH] Fix an integer overflow issue (#809)
+
-- 
2.10.0

[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 <mayeut@users.noreply.github.com>
+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

Re: [PATCH 1/2] gnu: openjpeg-2.*: Fix CVE-2016-7163.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 5719 bytes --]

On Fri, Sep 09, 2016 at 02:04:40AM -0400, Leo Famulari wrote:
> * gnu/packages/patches/openjpeg-CVE-2016-7163.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                            |  6 +-
>  gnu/packages/patches/openjpeg-CVE-2016-7163.patch | 71 +++++++++++++++++++++++
>  3 files changed, 76 insertions(+), 2 deletions(-)
>  create mode 100644 gnu/packages/patches/openjpeg-CVE-2016-7163.patch
> 
> diff --git a/gnu/local.mk b/gnu/local.mk
> index 8b042d5..668c9b2 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-7163.patch		\
>    %D%/packages/patches/openjpeg-use-after-free-fix.patch	\
>    %D%/packages/patches/openssl-runpath.patch			\
>    %D%/packages/patches/openssl-1.1.0-c-rehash-in.patch		\
> diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
> index a65bf39..64bc05d 100644
> --- a/gnu/packages/image.scm
> +++ b/gnu/packages/image.scm
> @@ -387,7 +387,8 @@ work.")
>          (sha256
>           (base32 "00zzm303zvv4ijzancrsb1cqbph3pgz0nky92k9qx3fq9y0vnchj"))
>          (patches (search-patches "openjpeg-use-after-free-fix.patch"
> -                                 "openjpeg-CVE-2015-6581.patch"))))
> +                                 "openjpeg-CVE-2015-6581.patch"
> +                                 "openjpeg-CVE-2016-7163.patch"))))
>      (build-system cmake-build-system)
>      (arguments
>        ;; Trying to run `$ make check' results in a no rule fault.
> @@ -424,7 +425,8 @@ error-resilience, a Java-viewer for j2k-images, ...")
>         (sha256
>          (base32 "1c2xc3nl2mg511b63rk7hrckmy14681p1m44mzw3n1fyqnjm0b0z"))
>         (patches (search-patches "openjpeg-use-after-free-fix.patch"
> -                                "openjpeg-CVE-2015-6581.patch"))))))
> +                                "openjpeg-CVE-2015-6581.patch"
> +                                "openjpeg-CVE-2016-7163.patch"))))))
>  
>  (define-public openjpeg-1
>    (package (inherit openjpeg)
> diff --git a/gnu/packages/patches/openjpeg-CVE-2016-7163.patch b/gnu/packages/patches/openjpeg-CVE-2016-7163.patch
> new file mode 100644
> index 0000000..68cf7b9
> --- /dev/null
> +++ b/gnu/packages/patches/openjpeg-CVE-2016-7163.patch
> @@ -0,0 +1,71 @@
> +Fix CVE-2016-7613 (Integer overflow in opj_pi_create_decode allowing execution
> +of arbitrary code):
> +
> +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-7163
> +https://github.com/uclouvain/openjpeg/issues/826
> +http://seclists.org/oss-sec/2016/q3/442
> +
> +Copied from upstream repository:
> +
> +https://github.com/uclouvain/openjpeg/commit/c16bc057ba3f125051c9966cf1f5b68a05681de4
> +https://github.com/uclouvain/openjpeg/commit/ef01f18dfc6780b776d0674ed3e7415c6ef54d24
> +
> +From ef01f18dfc6780b776d0674ed3e7415c6ef54d24 Mon Sep 17 00:00:00 2001
> +From: Matthieu Darbois <mayeut@users.noreply.github.com>
> +Date: Thu, 8 Sep 2016 07:34:46 +0200
> +Subject: [PATCH] Cast to size_t before multiplication
> +
> +Prevent an integer overflow issue in function opj_pi_create_decode of
> +pi.c.
> +---
> + src/lib/openjp2/pi.c | 8 +++++++-
> + 1 file changed, 7 insertions(+), 1 deletion(-)
> +
> +diff --git a/src/lib/openjp2/pi.c b/src/lib/openjp2/pi.c
> +index cffad66..36e2ff0 100644
> +--- a/src/lib/openjp2/pi.c
> ++++ b/src/lib/openjp2/pi.c
> +@@ -1237,7 +1237,13 @@ opj_pi_iterator_t *opj_pi_create_decode(opj_image_t *p_image,
> + 	l_current_pi = l_pi;
> + 
> + 	/* memory allocation for include */
> +-	l_current_pi->include = (OPJ_INT16*) opj_calloc((l_tcp->numlayers +1) * l_step_l, sizeof(OPJ_INT16));
> ++	/* prevent an integer overflow issue */
> ++	l_current_pi->include = 00;
> ++	if (l_step_l <= (SIZE_MAX / (l_tcp->numlayers + 1U)))
> ++	{
> ++		l_current_pi->include = (OPJ_INT16*) opj_calloc((l_tcp->numlayers +1) * l_step_l, sizeof(OPJ_INT16));
> ++	}
> ++
> + 	if
> + 		(!l_current_pi->include)
> + 	{
> +-- 
> +2.10.0
> +
> +Need to cast to size_t before multiplication otherwise overflow check is useless.
> +---
> + src/lib/openjp2/pi.c | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/src/lib/openjp2/pi.c b/src/lib/openjp2/pi.c
> +index 36e2ff0..809b33d 100644
> +--- a/src/lib/openjp2/pi.c
> ++++ b/src/lib/openjp2/pi.c
> +@@ -1241,7 +1241,7 @@ opj_pi_iterator_t *opj_pi_create_decode(opj_image_t *p_image,
> + 	l_current_pi->include = 00;
> + 	if (l_step_l <= (SIZE_MAX / (l_tcp->numlayers + 1U)))
> + 	{
> +-		l_current_pi->include = (OPJ_INT16*) opj_calloc((l_tcp->numlayers +1) * l_step_l, sizeof(OPJ_INT16));
> ++		l_current_pi->include = (OPJ_INT16*) opj_calloc((size_t)(l_tcp->numlayers + 1U) * l_step_l, sizeof(OPJ_INT16));
> + 	}
> + 
> + 	if
> +-- 
> +2.10.0
> +

Was from here down put/left here intentionally? It looks out of place

> +From c16bc057ba3f125051c9966cf1f5b68a05681de4 Mon Sep 17 00:00:00 2001
> +From: trylab <trylab@users.noreply.github.com>
> +Date: Tue, 6 Sep 2016 13:55:49 +0800
> +Subject: [PATCH] Fix an integer overflow issue (#809)
> +
> -- 
> 2.10.0
> 
> 

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 0/2] OpenJPEG security fixes (CVE-2016-{5157,7163})

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 1254 bytes --]

On Fri, Sep 09, 2016 at 02:04:39AM -0400, Leo Famulari wrote:
> Two bugs disclosed in OpenJPEG, CVE-2016-5157 and CVE-2016-7163. Both
> can be used to execute arbitrary code, apparently.

Ah! my favorite kind of code!

Joking aside, why not patch both CVEs at the same time?

> 
> CVE-2016-7163:
> http://seclists.org/oss-sec/2016/q3/442
> 
> CVE-2016-5157:
> http://seclists.org/oss-sec/2016/q3/441
> 
> Leo Famulari (2):
>   gnu: openjpeg-2.*: Fix CVE-2016-7163.
>   gnu: openjpeg-2.*: Fix CVE-2016-5157.
> 
>  gnu/local.mk                                      |  2 +
>  gnu/packages/image.scm                            |  8 +-
>  gnu/packages/patches/openjpeg-CVE-2016-5157.patch | 98 +++++++++++++++++++++++
>  gnu/packages/patches/openjpeg-CVE-2016-7163.patch | 71 ++++++++++++++++
>  4 files changed, 177 insertions(+), 2 deletions(-)
>  create mode 100644 gnu/packages/patches/openjpeg-CVE-2016-5157.patch
>  create mode 100644 gnu/packages/patches/openjpeg-CVE-2016-7163.patch
> 
> -- 
> 2.10.0
> 
> 

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 1/2] gnu: openjpeg-2.*: Fix CVE-2016-7163.

[Leo Famulari]

[-- Attachment #1.1: Type: text/plain, Size: 843 bytes --]

On Fri, Sep 09, 2016 at 10:15:58AM +0300, Efraim Flashner wrote:
> On Fri, Sep 09, 2016 at 02:04:40AM -0400, Leo Famulari wrote:
> > diff --git a/gnu/packages/patches/openjpeg-CVE-2016-7163.patch b/gnu/packages/patches/openjpeg-CVE-2016-7163.patch
[...]

> Was from here down put/left here intentionally? It looks out of place
> 
> > +From c16bc057ba3f125051c9966cf1f5b68a05681de4 Mon Sep 17 00:00:00 2001
> > +From: trylab <trylab@users.noreply.github.com>
> > +Date: Tue, 6 Sep 2016 13:55:49 +0800
> > +Subject: [PATCH] Fix an integer overflow issue (#809)
> > +
> > -- 
> > 2.10.0

You're right. I had concatenated the two commits out of order, and I
accidentally left this header at the bottom when moving the original
bugfix above the follow-up commit.

Thank you for catching this.

I've attached an updated patch.

[-- Attachment #1.2: 0001-gnu-openjpeg-2.-Fix-CVE-2016-7163.patch --]
[-- Type: text/plain, Size: 5320 bytes --]

From 040531530913dbf26ce42ad27e1914f4d1683bd3 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Fri, 9 Sep 2016 01:48:50 -0400
Subject: [PATCH] gnu: openjpeg-2.*: Fix CVE-2016-7163.

* gnu/packages/patches/openjpeg-CVE-2016-7163.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                            |  6 +-
 gnu/packages/patches/openjpeg-CVE-2016-7163.patch | 71 +++++++++++++++++++++++
 3 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/openjpeg-CVE-2016-7163.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 8b042d5..668c9b2 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-7163.patch		\
   %D%/packages/patches/openjpeg-use-after-free-fix.patch	\
   %D%/packages/patches/openssl-runpath.patch			\
   %D%/packages/patches/openssl-1.1.0-c-rehash-in.patch		\
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index a65bf39..64bc05d 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -387,7 +387,8 @@ work.")
         (sha256
          (base32 "00zzm303zvv4ijzancrsb1cqbph3pgz0nky92k9qx3fq9y0vnchj"))
         (patches (search-patches "openjpeg-use-after-free-fix.patch"
-                                 "openjpeg-CVE-2015-6581.patch"))))
+                                 "openjpeg-CVE-2015-6581.patch"
+                                 "openjpeg-CVE-2016-7163.patch"))))
     (build-system cmake-build-system)
     (arguments
       ;; Trying to run `$ make check' results in a no rule fault.
@@ -424,7 +425,8 @@ error-resilience, a Java-viewer for j2k-images, ...")
        (sha256
         (base32 "1c2xc3nl2mg511b63rk7hrckmy14681p1m44mzw3n1fyqnjm0b0z"))
        (patches (search-patches "openjpeg-use-after-free-fix.patch"
-                                "openjpeg-CVE-2015-6581.patch"))))))
+                                "openjpeg-CVE-2015-6581.patch"
+                                "openjpeg-CVE-2016-7163.patch"))))))
 
 (define-public openjpeg-1
   (package (inherit openjpeg)
diff --git a/gnu/packages/patches/openjpeg-CVE-2016-7163.patch b/gnu/packages/patches/openjpeg-CVE-2016-7163.patch
new file mode 100644
index 0000000..a4a24e4
--- /dev/null
+++ b/gnu/packages/patches/openjpeg-CVE-2016-7163.patch
@@ -0,0 +1,71 @@
+Fix CVE-2016-7613 (Integer overflow in opj_pi_create_decode allowing execution
+of arbitrary code):
+
+https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-7163
+https://github.com/uclouvain/openjpeg/issues/826
+http://seclists.org/oss-sec/2016/q3/442
+
+Copied from upstream repository:
+
+https://github.com/uclouvain/openjpeg/commit/c16bc057ba3f125051c9966cf1f5b68a05681de4
+https://github.com/uclouvain/openjpeg/commit/ef01f18dfc6780b776d0674ed3e7415c6ef54d24
+
+From c16bc057ba3f125051c9966cf1f5b68a05681de4 Mon Sep 17 00:00:00 2001
+From: trylab <trylab@users.noreply.github.com>
+Date: Tue, 6 Sep 2016 13:55:49 +0800
+Subject: [PATCH] Fix an integer overflow issue (#809)
+
+Prevent an integer overflow issue in function opj_pi_create_decode of
+pi.c.
+---
+ src/lib/openjp2/pi.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/openjp2/pi.c b/src/lib/openjp2/pi.c
+index cffad66..36e2ff0 100644
+--- a/src/lib/openjp2/pi.c
++++ b/src/lib/openjp2/pi.c
+@@ -1237,7 +1237,13 @@ opj_pi_iterator_t *opj_pi_create_decode(opj_image_t *p_image,
+ 	l_current_pi = l_pi;
+ 
+ 	/* memory allocation for include */
+-	l_current_pi->include = (OPJ_INT16*) opj_calloc((l_tcp->numlayers +1) * l_step_l, sizeof(OPJ_INT16));
++	/* prevent an integer overflow issue */
++	l_current_pi->include = 00;
++	if (l_step_l <= (SIZE_MAX / (l_tcp->numlayers + 1U)))
++	{
++		l_current_pi->include = (OPJ_INT16*) opj_calloc((l_tcp->numlayers +1) * l_step_l, sizeof(OPJ_INT16));
++	}
++
+ 	if
+ 		(!l_current_pi->include)
+ 	{
+-- 
+2.10.0
+
+From ef01f18dfc6780b776d0674ed3e7415c6ef54d24 Mon Sep 17 00:00:00 2001
+From: Matthieu Darbois <mayeut@users.noreply.github.com>
+Date: Thu, 8 Sep 2016 07:34:46 +0200
+Subject: [PATCH] Cast to size_t before multiplication
+
+Need to cast to size_t before multiplication otherwise overflow check is useless.
+---
+ src/lib/openjp2/pi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/openjp2/pi.c b/src/lib/openjp2/pi.c
+index 36e2ff0..809b33d 100644
+--- a/src/lib/openjp2/pi.c
++++ b/src/lib/openjp2/pi.c
+@@ -1241,7 +1241,7 @@ opj_pi_iterator_t *opj_pi_create_decode(opj_image_t *p_image,
+ 	l_current_pi->include = 00;
+ 	if (l_step_l <= (SIZE_MAX / (l_tcp->numlayers + 1U)))
+ 	{
+-		l_current_pi->include = (OPJ_INT16*) opj_calloc((l_tcp->numlayers +1) * l_step_l, sizeof(OPJ_INT16));
++		l_current_pi->include = (OPJ_INT16*) opj_calloc((size_t)(l_tcp->numlayers + 1U) * l_step_l, sizeof(OPJ_INT16));
+ 	}
+ 
+ 	if
+-- 
+2.10.0
+
-- 
2.10.0


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

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

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 199 bytes --]

On Fri, Sep 09, 2016 at 02:04:41AM -0400, Leo Famulari wrote:
> * gnu/packages/patches/openjpeg-CVE-2016-5157.patch: New file.

This patch doesn't apply. I'm checking if we need to upgrade to 2.1.1.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

v2: OpenJPEG security fixes (CVE-2016-{5157,7163})

[Leo Famulari]

[-- Attachment #1.1: Type: text/plain, Size: 1143 bytes --]

On Fri, Sep 09, 2016 at 02:04:39AM -0400, Leo Famulari wrote:
> Two bugs disclosed in OpenJPEG, CVE-2016-5157 and CVE-2016-7163. Both
> can be used to execute arbitrary code, apparently.
> 
> CVE-2016-7163:
> http://seclists.org/oss-sec/2016/q3/442
> 
> CVE-2016-5157:
> http://seclists.org/oss-sec/2016/q3/441

My previous attempt to fix these bugs did not work. The patch for
CVE-2016-7163 was mangled in a confusing way, and the patch for
CVE-2016-5157 simply did not apply.

Here is an updated patch series.

First, it updates openjpeg to 2.1.1, which apparently has not changed
the ABI or API:
https://github.com/uclouvain/openjpeg/blob/master/NEWS.md#openjpeg-211

Then, it applies the fix for CVE-2016-7163 to openjpeg and openjpeg-2.0.

Finally, it adapts the upstream fix for CVE-2016-5157 and applies it to
openjpeg. I had to amend this commit slightly, since the diff that adds
tests for the fixed issue referred to a commit that is not yet released.

Also, the fix for CVE-2016-5157 does not apply to openjpeg-2.0. I'd like
to investigate this issue separately. The only user of openjpeg-2.0 is
mupdf.

[-- Attachment #1.2: 0001-gnu-openjpeg-Update-to-2.1.1.patch --]
[-- Type: text/plain, Size: 1660 bytes --]

From 1d03058d95306e6ea30082f58ec2d4fd227971a9 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Fri, 9 Sep 2016 13:41:13 -0400
Subject: [PATCH 1/3] gnu: openjpeg: Update to 2.1.1.

* gnu/packages/image.scm (openjpeg): Update to 2.1.1.
[source]: Use GitHub URL and add file-name field. Remove
"openjpeg-use-after-free-fix.patch" and "openjpeg-CVE-2015-6581.patch" from
patches.
---
 gnu/packages/image.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 2a2a77e..aafe705 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -380,17 +380,17 @@ work.")
 (define-public openjpeg
   (package
     (name "openjpeg")
-    (version "2.1.0")
+    (version "2.1.1")
     (source
       (origin
         (method url-fetch)
         (uri
-         (string-append "mirror://sourceforge/openjpeg.mirror/" version "/"
-                        name "-" version ".tar.gz"))
+         (string-append "https://github.com/uclouvain/openjpeg/archive/v"
+                        version ".tar.gz"))
+        (file-name (string-append name "-" version ".tar.gz"))
         (sha256
-         (base32 "00zzm303zvv4ijzancrsb1cqbph3pgz0nky92k9qx3fq9y0vnchj"))
-        (patches (search-patches "openjpeg-use-after-free-fix.patch"
-                                 "openjpeg-CVE-2015-6581.patch"))))
+         (base32
+          "1anv0rjkbxw9kx91wvlfpb3dhppibda6kb1papny46bjzi3pzhl2"))))
     (build-system cmake-build-system)
     (arguments
       ;; Trying to run `$ make check' results in a no rule fault.
-- 
2.10.0


[-- Attachment #1.3: 0002-gnu-openjpeg-2.-Fix-CVE-2016-7163.patch --]
[-- Type: text/plain, Size: 5265 bytes --]

From 1fa715c6d7b01d26794066d853e59b69e4df805e Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Fri, 9 Sep 2016 01:48:50 -0400
Subject: [PATCH 2/3] gnu: openjpeg-2.*: Fix CVE-2016-7163.

* gnu/packages/patches/openjpeg-CVE-2016-7163.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                            |  6 +-
 gnu/packages/patches/openjpeg-CVE-2016-7163.patch | 71 +++++++++++++++++++++++
 3 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/openjpeg-CVE-2016-7163.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 7d14f8c..bce0d69 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-7163.patch		\
   %D%/packages/patches/openjpeg-use-after-free-fix.patch	\
   %D%/packages/patches/openssl-runpath.patch			\
   %D%/packages/patches/openssl-1.1.0-c-rehash-in.patch		\
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index aafe705..be0bb6f 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -390,7 +390,8 @@ work.")
         (file-name (string-append name "-" version ".tar.gz"))
         (sha256
          (base32
-          "1anv0rjkbxw9kx91wvlfpb3dhppibda6kb1papny46bjzi3pzhl2"))))
+          "1anv0rjkbxw9kx91wvlfpb3dhppibda6kb1papny46bjzi3pzhl2"))
+        (patches (search-patches "openjpeg-CVE-2016-7163.patch"))))
     (build-system cmake-build-system)
     (arguments
       ;; Trying to run `$ make check' results in a no rule fault.
@@ -427,7 +428,8 @@ error-resilience, a Java-viewer for j2k-images, ...")
        (sha256
         (base32 "1c2xc3nl2mg511b63rk7hrckmy14681p1m44mzw3n1fyqnjm0b0z"))
        (patches (search-patches "openjpeg-use-after-free-fix.patch"
-                                "openjpeg-CVE-2015-6581.patch"))))))
+                                "openjpeg-CVE-2015-6581.patch"
+                                "openjpeg-CVE-2016-7163.patch"))))))
 
 (define-public openjpeg-1
   (package (inherit openjpeg)
diff --git a/gnu/packages/patches/openjpeg-CVE-2016-7163.patch b/gnu/packages/patches/openjpeg-CVE-2016-7163.patch
new file mode 100644
index 0000000..a4a24e4
--- /dev/null
+++ b/gnu/packages/patches/openjpeg-CVE-2016-7163.patch
@@ -0,0 +1,71 @@
+Fix CVE-2016-7613 (Integer overflow in opj_pi_create_decode allowing execution
+of arbitrary code):
+
+https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-7163
+https://github.com/uclouvain/openjpeg/issues/826
+http://seclists.org/oss-sec/2016/q3/442
+
+Copied from upstream repository:
+
+https://github.com/uclouvain/openjpeg/commit/c16bc057ba3f125051c9966cf1f5b68a05681de4
+https://github.com/uclouvain/openjpeg/commit/ef01f18dfc6780b776d0674ed3e7415c6ef54d24
+
+From c16bc057ba3f125051c9966cf1f5b68a05681de4 Mon Sep 17 00:00:00 2001
+From: trylab <trylab@users.noreply.github.com>
+Date: Tue, 6 Sep 2016 13:55:49 +0800
+Subject: [PATCH] Fix an integer overflow issue (#809)
+
+Prevent an integer overflow issue in function opj_pi_create_decode of
+pi.c.
+---
+ src/lib/openjp2/pi.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/openjp2/pi.c b/src/lib/openjp2/pi.c
+index cffad66..36e2ff0 100644
+--- a/src/lib/openjp2/pi.c
++++ b/src/lib/openjp2/pi.c
+@@ -1237,7 +1237,13 @@ opj_pi_iterator_t *opj_pi_create_decode(opj_image_t *p_image,
+ 	l_current_pi = l_pi;
+ 
+ 	/* memory allocation for include */
+-	l_current_pi->include = (OPJ_INT16*) opj_calloc((l_tcp->numlayers +1) * l_step_l, sizeof(OPJ_INT16));
++	/* prevent an integer overflow issue */
++	l_current_pi->include = 00;
++	if (l_step_l <= (SIZE_MAX / (l_tcp->numlayers + 1U)))
++	{
++		l_current_pi->include = (OPJ_INT16*) opj_calloc((l_tcp->numlayers +1) * l_step_l, sizeof(OPJ_INT16));
++	}
++
+ 	if
+ 		(!l_current_pi->include)
+ 	{
+-- 
+2.10.0
+
+From ef01f18dfc6780b776d0674ed3e7415c6ef54d24 Mon Sep 17 00:00:00 2001
+From: Matthieu Darbois <mayeut@users.noreply.github.com>
+Date: Thu, 8 Sep 2016 07:34:46 +0200
+Subject: [PATCH] Cast to size_t before multiplication
+
+Need to cast to size_t before multiplication otherwise overflow check is useless.
+---
+ src/lib/openjp2/pi.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/openjp2/pi.c b/src/lib/openjp2/pi.c
+index 36e2ff0..809b33d 100644
+--- a/src/lib/openjp2/pi.c
++++ b/src/lib/openjp2/pi.c
+@@ -1241,7 +1241,7 @@ opj_pi_iterator_t *opj_pi_create_decode(opj_image_t *p_image,
+ 	l_current_pi->include = 00;
+ 	if (l_step_l <= (SIZE_MAX / (l_tcp->numlayers + 1U)))
+ 	{
+-		l_current_pi->include = (OPJ_INT16*) opj_calloc((l_tcp->numlayers +1) * l_step_l, sizeof(OPJ_INT16));
++		l_current_pi->include = (OPJ_INT16*) opj_calloc((size_t)(l_tcp->numlayers + 1U) * l_step_l, sizeof(OPJ_INT16));
+ 	}
+ 
+ 	if
+-- 
+2.10.0
+
-- 
2.10.0


[-- Attachment #1.4: 0003-gnu-openjpeg-Fix-CVE-2016-5157.patch --]
[-- Type: text/plain, Size: 6372 bytes --]

From 80b91ab0363484737871764861b6e802e36bb39b Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Fri, 9 Sep 2016 01:59:35 -0400
Subject: [PATCH 3/3] gnu: openjpeg: Fix CVE-2016-5157.

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

diff --git a/gnu/local.mk b/gnu/local.mk
index bce0d69..eab58f6 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 be0bb6f..fe21d23 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -391,7 +391,8 @@ work.")
         (sha256
          (base32
           "1anv0rjkbxw9kx91wvlfpb3dhppibda6kb1papny46bjzi3pzhl2"))
-        (patches (search-patches "openjpeg-CVE-2016-7163.patch"))))
+        (patches (search-patches "openjpeg-CVE-2016-5157.patch"
+                                 "openjpeg-CVE-2016-7163.patch"))))
     (build-system cmake-build-system)
     (arguments
       ;; Trying to run `$ make check' results in a no rule fault.
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..f83bd9b
--- /dev/null
+++ b/gnu/packages/patches/openjpeg-CVE-2016-5157.patch
@@ -0,0 +1,96 @@
+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
+
+Adapted from upstream source repository:
+
+https://github.com/uclouvain/openjpeg/commit/e078172b1c3f98d2219c37076b238fb759c751ea
+
+The final hunk of the patch, affecting
+'tests/nonregression/test_suite.ctest.in', had to be adjusted, since it referred
+to some context that is not yet provided by a tagged release.
+
+From c80286a4d573ad07ccc3c8b53289c38bb8256b30 Mon Sep 17 00:00:00 2001
+From: Leo Famulari <leo@famulari.name>
+Date: Fri, 9 Sep 2016 04:37:40 -0400
+Subject: [PATCH] CVE-2016-5157 adjusted to apply to 2.1.0.
+
+---
+ src/lib/openjp2/tcd.c                   | 11 +++++++++++
+ tests/compare_dump_files.c              | 14 +++++++-------
+ tests/nonregression/test_suite.ctest.in |  2 ++
+ 3 files changed, 20 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 d393e6c..90cfa43 100644
+--- a/tests/nonregression/test_suite.ctest.in
++++ b/tests/nonregression/test_suite.ctest.in
+@@ -564,3 +564,5 @@ opj_decompress -i @INPUT_NR_PATH@/issue726.j2k -o @TEMP_PATH@/issue726.png
+ # issue 775
+ !opj_decompress -i @INPUT_NR_PATH@/issue775.j2k -o @TEMP_PATH@/issue775.png
+ !opj_decompress -i @INPUT_NR_PATH@/issue775-2.j2k -o @TEMP_PATH@/issue775-2.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


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: v2: OpenJPEG security fixes (CVE-2016-{5157,7163})

[Leo Famulari]

[-- Attachment #1.1: Type: text/plain, Size: 466 bytes --]

On Fri, Sep 09, 2016 at 02:04:58PM -0400, Leo Famulari wrote:
> Also, the fix for CVE-2016-5157 does not apply to openjpeg-2.0. I'd like
> to investigate this issue separately. The only user of openjpeg-2.0 is
> mupdf.

I think the best thing to do is update mupdf to the latest upstream
release, 1.9a, make it use openjpeg@2.1, and remove openjpeg-2.0.

Please see attached. These patches should be applied on top of the
patches in the email that I am replying to.

[-- Attachment #1.2: 0001-gnu-mupdf-Update-to-1.9a.patch --]
[-- Type: text/plain, Size: 5584 bytes --]

From a357edf0f568acf937f2cd9f0e97269221aee3f2 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Fri, 9 Sep 2016 16:08:02 -0400
Subject: [PATCH 1/2] gnu: mupdf: Update to 1.9a.

* gnu/packages/pdf.scm (mupdf): Update to 1.9a.
[source]: Use "mupdf-build-with-openjpeg-2.1.patch". Adjust snippet to
preserve bundled 'thirdparty/mujs'.
[inputs]: Add harfbuzz. Replace openjpeg-2.0 with openjpeg.
* gnu/packages/patches/mupdf-build-with-openjpeg-2.1.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/local.mk                                       |  1 +
 .../patches/mupdf-build-with-openjpeg-2.1.patch    | 38 ++++++++++++++++++++++
 gnu/packages/pdf.scm                               | 26 +++++++++++----
 3 files changed, 59 insertions(+), 6 deletions(-)
 create mode 100644 gnu/packages/patches/mupdf-build-with-openjpeg-2.1.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index eab58f6..515ca35 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -681,6 +681,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/mplayer2-theora-fix.patch		\
   %D%/packages/patches/module-init-tools-moduledir.patch	\
   %D%/packages/patches/mumps-build-parallelism.patch		\
+  %D%/packages/patches/mupdf-build-with-openjpeg-2.1.patch	\
   %D%/packages/patches/mupdf-CVE-2016-6265.patch		\
   %D%/packages/patches/mupdf-CVE-2016-6525.patch		\
   %D%/packages/patches/mupen64plus-ui-console-notice.patch	\
diff --git a/gnu/packages/patches/mupdf-build-with-openjpeg-2.1.patch b/gnu/packages/patches/mupdf-build-with-openjpeg-2.1.patch
new file mode 100644
index 0000000..cd8136b
--- /dev/null
+++ b/gnu/packages/patches/mupdf-build-with-openjpeg-2.1.patch
@@ -0,0 +1,38 @@
+Make it possible to build MuPDF with OpenJPEG 2.1, which is the latest
+release series and contains many important bug fixes.
+
+Patch adapted from Debian:
+
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=745246
+
+And related to this upstream commit:
+
+http://git.ghostscript.com/?p=mupdf.git;a=commit;h=f88bfe2e62dbadb96d4f52d7aa025f0a516078da
+
+diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c
+index 6b92e5c..72dea50 100644
+--- a/source/fitz/load-jpx.c
++++ b/source/fitz/load-jpx.c
+@@ -1,13 +1,5 @@
+ #include "mupdf/fitz.h"
+ 
+-/* Without the definition of OPJ_STATIC, compilation fails on windows
+- * due to the use of __stdcall. We believe it is required on some
+- * linux toolchains too. */
+-#define OPJ_STATIC
+-#ifndef _MSC_VER
+-#define OPJ_HAVE_STDINT_H
+-#endif
+-
+ #include <openjpeg.h>
+ 
+ static void fz_opj_error_callback(const char *msg, void *client_data)
+@@ -117,7 +109,7 @@ fz_load_jpx(fz_context *ctx, unsigned char *data, int size, fz_colorspace *defcs
+ 	opj_stream_set_read_function(stream, fz_opj_stream_read);
+ 	opj_stream_set_skip_function(stream, fz_opj_stream_skip);
+ 	opj_stream_set_seek_function(stream, fz_opj_stream_seek);
+-	opj_stream_set_user_data(stream, &sb);
++	opj_stream_set_user_data(stream, &sb, NULL);
+ 	/* Set the length to avoid an assert */
+ 	opj_stream_set_user_data_length(stream, size);
+ 
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 74e8907..98cc92e 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -53,6 +53,7 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages python)
   #:use-module (gnu packages tls)
+  #:use-module (gnu packages javascript)
   #:use-module (srfi srfi-1))
 
 (define-public poppler
@@ -466,29 +467,42 @@ extracting content or merging files.")
 (define-public mupdf
   (package
     (name "mupdf")
-    (version "1.8")
+    (version "1.9a")
     (source
       (origin
         (method url-fetch)
         (uri (string-append "http://mupdf.com/downloads/archive/"
                             name "-" version "-source.tar.gz"))
         (sha256
-          (base32 "01n26cy41lc2fjri63s4js23ixxb4nd37aafry3hz4i4id6wd8x2"))
-        (patches (search-patches "mupdf-CVE-2016-6265.patch"
+         (base32
+          "1k64pdapyj8a336jw3j61fhn0rp4q6az7d0dqp9r5n3d9rgwa5c0"))
+        (patches (search-patches "mupdf-build-with-openjpeg-2.1.patch"
+                                 "mupdf-CVE-2016-6265.patch"
                                  "mupdf-CVE-2016-6525.patch"))
         (modules '((guix build utils)))
         (snippet
-            ;; Don't build the bundled-in third party libraries.
-            '(delete-file-recursively "thirdparty"))))
+            ;; Delete all the bundled libraries except for mujs, which is
+            ;; developed by the same team as mupdf and has no releases.
+            ;; TODO Package mujs and don't use the bundled copy.
+            '(for-each delete-file-recursively
+                       '("thirdparty/curl"
+                         "thirdparty/freetype"
+                         "thirdparty/glfw"
+                         "thirdparty/harfbuzz"
+                         "thirdparty/jbig2dec"
+                         "thirdparty/jpeg"
+                         "thirdparty/openjpeg"
+                         "thirdparty/zlib")))))
     (build-system gnu-build-system)
     (inputs
       `(("curl" ,curl)
         ("freetype" ,freetype)
+        ("harfbuzz" ,harfbuzz)
         ("jbig2dec" ,jbig2dec)
         ("libjpeg" ,libjpeg)
         ("libx11" ,libx11)
         ("libxext" ,libxext)
-        ("openjpeg" ,openjpeg-2.0)
+        ("openjpeg" ,openjpeg)
         ("openssl" ,openssl)
         ("zlib" ,zlib)))
     (native-inputs
-- 
2.10.0


[-- Attachment #1.3: 0002-gnu-Remove-openjpeg-2.0.patch --]
[-- Type: text/plain, Size: 1381 bytes --]

From 8c201fd0392bee804bf11f7c07f4817e3766becd Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Fri, 9 Sep 2016 16:24:12 -0400
Subject: [PATCH 2/2] gnu: Remove openjpeg-2.0.

* gnu/packages/image.scm (openjpeg-2.0): Remove variable.
---
 gnu/packages/image.scm | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index fe21d23..8d3c01f 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -416,22 +416,6 @@ error-resilience, a Java-viewer for j2k-images, ...")
     (home-page "https://github.com/uclouvain/openjpeg")
     (license license:bsd-2)))
 
-(define-public openjpeg-2.0
-  (package (inherit openjpeg)
-    (name "openjpeg")
-    (version "2.0.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri
-        (string-append "mirror://sourceforge/openjpeg.mirror/" version "/"
-                       name "-" version ".tar.gz"))
-       (sha256
-        (base32 "1c2xc3nl2mg511b63rk7hrckmy14681p1m44mzw3n1fyqnjm0b0z"))
-       (patches (search-patches "openjpeg-use-after-free-fix.patch"
-                                "openjpeg-CVE-2015-6581.patch"
-                                "openjpeg-CVE-2016-7163.patch"))))))
-
 (define-public openjpeg-1
   (package (inherit openjpeg)
     (name "openjpeg")
-- 
2.10.0


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 1/2] gnu: openjpeg-2.*: Fix CVE-2016-7163.

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> On Fri, Sep 09, 2016 at 10:15:58AM +0300, Efraim Flashner wrote:
>> On Fri, Sep 09, 2016 at 02:04:40AM -0400, Leo Famulari wrote:
>> > diff --git a/gnu/packages/patches/openjpeg-CVE-2016-7163.patch b/gnu/packages/patches/openjpeg-CVE-2016-7163.patch
> [...]
>
>> Was from here down put/left here intentionally? It looks out of place
>> 
>> > +From c16bc057ba3f125051c9966cf1f5b68a05681de4 Mon Sep 17 00:00:00 2001
>> > +From: trylab <trylab@users.noreply.github.com>
>> > +Date: Tue, 6 Sep 2016 13:55:49 +0800
>> > +Subject: [PATCH] Fix an integer overflow issue (#809)
>> > +
>> > -- 
>> > 2.10.0
>
> You're right. I had concatenated the two commits out of order, and I
> accidentally left this header at the bottom when moving the original
> bugfix above the follow-up commit.
>
> Thank you for catching this.
>
> I've attached an updated patch.
>
> From 040531530913dbf26ce42ad27e1914f4d1683bd3 Mon Sep 17 00:00:00 2001
> From: Leo Famulari <leo@famulari.name>
> Date: Fri, 9 Sep 2016 01:48:50 -0400
> Subject: [PATCH] gnu: openjpeg-2.*: Fix CVE-2016-7163.
>
> * gnu/packages/patches/openjpeg-CVE-2016-7163.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Add it.
> * gnu/packages/image.scm (openjpeg, openjpeg-2.0): Use it.

Go for it.  Thank you!

Ludo’.

Re: v2: OpenJPEG security fixes (CVE-2016-{5157,7163})

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> On Fri, Sep 09, 2016 at 02:04:58PM -0400, Leo Famulari wrote:
>> Also, the fix for CVE-2016-5157 does not apply to openjpeg-2.0. I'd like
>> to investigate this issue separately. The only user of openjpeg-2.0 is
>> mupdf.
>
> I think the best thing to do is update mupdf to the latest upstream
> release, 1.9a, make it use openjpeg@2.1, and remove openjpeg-2.0.

Yes, even better.

> Please see attached. These patches should be applied on top of the
> patches in the email that I am replying to.

The patches in question LGTM.

> From a357edf0f568acf937f2cd9f0e97269221aee3f2 Mon Sep 17 00:00:00 2001
> From: Leo Famulari <leo@famulari.name>
> Date: Fri, 9 Sep 2016 16:08:02 -0400
> Subject: [PATCH 1/2] gnu: mupdf: Update to 1.9a.
>
> * gnu/packages/pdf.scm (mupdf): Update to 1.9a.
> [source]: Use "mupdf-build-with-openjpeg-2.1.patch". Adjust snippet to
> preserve bundled 'thirdparty/mujs'.
> [inputs]: Add harfbuzz. Replace openjpeg-2.0 with openjpeg.
> * gnu/packages/patches/mupdf-build-with-openjpeg-2.1.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Add it.

[...]

> From 8c201fd0392bee804bf11f7c07f4817e3766becd Mon Sep 17 00:00:00 2001
> From: Leo Famulari <leo@famulari.name>
> Date: Fri, 9 Sep 2016 16:24:12 -0400
> Subject: [PATCH 2/2] gnu: Remove openjpeg-2.0.
>
> * gnu/packages/image.scm (openjpeg-2.0): Remove variable.

OK as well.

Thank you for handling this nicely!

Ludo’.

Re: v2: OpenJPEG security fixes (CVE-2016-{5157,7163})

[Leo Famulari]

On Sat, Sep 10, 2016 at 12:34:39AM +0200, Ludovic Courtès wrote:
> > Please see attached. These patches should be applied on top of the
> > patches in the email that I am replying to.
> 
> The patches in question LGTM.
> 
> > From a357edf0f568acf937f2cd9f0e97269221aee3f2 Mon Sep 17 00:00:00 2001
> > From: Leo Famulari <leo@famulari.name>
> > Date: Fri, 9 Sep 2016 16:08:02 -0400
> > Subject: [PATCH 1/2] gnu: mupdf: Update to 1.9a.
> >
> > * gnu/packages/pdf.scm (mupdf): Update to 1.9a.
> > [source]: Use "mupdf-build-with-openjpeg-2.1.patch". Adjust snippet to
> > preserve bundled 'thirdparty/mujs'.
> > [inputs]: Add harfbuzz. Replace openjpeg-2.0 with openjpeg.
> > * gnu/packages/patches/mupdf-build-with-openjpeg-2.1.patch: New file.
> > * gnu/local.mk (dist_patch_DATA): Add it.
> 
> [...]
> 
> > From 8c201fd0392bee804bf11f7c07f4817e3766becd Mon Sep 17 00:00:00 2001
> > From: Leo Famulari <leo@famulari.name>
> > Date: Fri, 9 Sep 2016 16:24:12 -0400
> > Subject: [PATCH 2/2] gnu: Remove openjpeg-2.0.
> >
> > * gnu/packages/image.scm (openjpeg-2.0): Remove variable.
> 
> OK as well.

Pushed to 2884c63cbc4b5254d767436a145c03a7480c9755. Thanks for the
reviews!