From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: v2: OpenJPEG security fixes (CVE-2016-{5157,7163}) Date: Fri, 9 Sep 2016 14:04:58 -0400 Message-ID: <20160909180458.GA2732@jasmine> References: Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="7ZAtKRhVyVSsbBD2" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55869) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1biQAo-0004QB-M3 for guix-devel@gnu.org; Fri, 09 Sep 2016 14:05:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1biQAj-0004k3-Fd for guix-devel@gnu.org; Fri, 09 Sep 2016 14:05:09 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:57032) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1biQAi-0004ix-59 for guix-devel@gnu.org; Fri, 09 Sep 2016 14:05:05 -0400 Received: from localhost (c-73-188-17-148.hsd1.pa.comcast.net [73.188.17.148]) by mail.messagingengine.com (Postfix) with ESMTPA id 26872F29CD for ; Fri, 9 Sep 2016 14:04:59 -0400 (EDT) Content-Disposition: inline In-Reply-To: List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org --7ZAtKRhVyVSsbBD2 Content-Type: multipart/mixed; boundary="mYCpIKhGyMATD0i+" Content-Disposition: inline --mYCpIKhGyMATD0i+ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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. >=20 > CVE-2016-7163: > http://seclists.org/oss-sec/2016/q3/442 >=20 > 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. --mYCpIKhGyMATD0i+ Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-gnu-openjpeg-Update-to-2.1.1.patch" Content-Transfer-Encoding: quoted-printable =46rom 1d03058d95306e6ea30082f58ec2d4fd227971a9 Mon Sep 17 00:00:00 2001 =46rom: Leo Famulari 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. --=20 2.10.0 --mYCpIKhGyMATD0i+ Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0002-gnu-openjpeg-2.-Fix-CVE-2016-7163.patch" Content-Transfer-Encoding: quoted-printable =46rom 1fa715c6d7b01d26794066d853e59b69e4df805e Mon Sep 17 00:00:00 2001 =46rom: Leo Famulari 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 =3D \ %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")))))) =20 (define-public openjpeg-1 (package (inherit openjpeg) diff --git a/gnu/packages/patches/openjpeg-CVE-2016-7163.patch b/gnu/packag= es/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 execu= tion +of arbitrary code): + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=3DCVE-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/c16bc057ba3f125051c9966cf1f5b= 68a05681de4 +https://github.com/uclouvain/openjpeg/commit/ef01f18dfc6780b776d0674ed3e74= 15c6ef54d24 + +From c16bc057ba3f125051c9966cf1f5b68a05681de4 Mon Sep 17 00:00:00 2001 +From: trylab +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 =3D l_pi; +=20 + /* memory allocation for include */ +- l_current_pi->include =3D (OPJ_INT16*) opj_calloc((l_tcp->numlayers +1) = * l_step_l, sizeof(OPJ_INT16)); ++ /* prevent an integer overflow issue */ ++ l_current_pi->include =3D 00; ++ if (l_step_l <=3D (SIZE_MAX / (l_tcp->numlayers + 1U))) ++ { ++ l_current_pi->include =3D (OPJ_INT16*) opj_calloc((l_tcp->numlayers +1)= * l_step_l, sizeof(OPJ_INT16)); ++ } ++ + if + (!l_current_pi->include) + { +--=20 +2.10.0 + +From ef01f18dfc6780b776d0674ed3e7415c6ef54d24 Mon Sep 17 00:00:00 2001 +From: Matthieu Darbois +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 u= seless. +--- + 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 =3D 00; + if (l_step_l <=3D (SIZE_MAX / (l_tcp->numlayers + 1U))) + { +- l_current_pi->include =3D (OPJ_INT16*) opj_calloc((l_tcp->numlayers +1)= * l_step_l, sizeof(OPJ_INT16)); ++ l_current_pi->include =3D (OPJ_INT16*) opj_calloc((size_t)(l_tcp->numla= yers + 1U) * l_step_l, sizeof(OPJ_INT16)); + } +=20 + if +--=20 +2.10.0 + --=20 2.10.0 --mYCpIKhGyMATD0i+ Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0003-gnu-openjpeg-Fix-CVE-2016-5157.patch" Content-Transfer-Encoding: quoted-printable =46rom 80b91ab0363484737871764861b6e802e36bb39b Mon Sep 17 00:00:00 2001 =46rom: Leo Famulari 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 =3D \ %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/packag= es/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 execut= ion of +arbitrary code): + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=3DCVE-2016-5157 +https://pdfium.googlesource.com/pdfium/+/b6befb2ed2485a3805cddea86dc757451= 0178ea9 +http://seclists.org/oss-sec/2016/q3/441 + +Adapted from upstream source repository: + +https://github.com/uclouvain/openjpeg/commit/e078172b1c3f98d2219c37076b238= fb759c751ea + +The final hunk of the patch, affecting +'tests/nonregression/test_suite.ctest.in', had to be adjusted, since it re= ferred +to some context that is not yet provided by a tagged release. + +From c80286a4d573ad07ccc3c8b53289c38bb8256b30 Mon Sep 17 00:00:00 2001 +From: Leo Famulari +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 =3D l_cp->tx0 + p * l_cp->tdx; /* can't be greater than l_image->x= 1 so won't overflow */ + l_tile->x0 =3D (OPJ_INT32)opj_uint_max(l_tx0, l_image->x0); + l_tile->x1 =3D (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 ch= eck */ ++ if ((l_tile->x0 < 0) || (l_tile->x1 <=3D l_tile->x0)) { ++ opj_event_msg(manager, EVT_ERROR, "Tile X coordinates are not supported= \n"); ++ return OPJ_FALSE; ++ } + l_ty0 =3D l_cp->ty0 + q * l_cp->tdy; /* can't be greater than l_image->y= 1 so won't overflow */ + l_tile->y0 =3D (OPJ_INT32)opj_uint_max(l_ty0, l_image->y0); + l_tile->y1 =3D (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 ch= eck */ ++ if ((l_tile->y0 < 0) || (l_tile->y1 <=3D l_tile->y0)) { ++ opj_event_msg(manager, EVT_ERROR, "Tile Y coordinates are not supported= \n"); ++ return OPJ_FALSE; ++ } ++=09 +=20 + /* testcase 1888.pdf.asan.35.988 */ + if (l_tccp->numresolutions =3D=3D 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=3DNULL, *ftest=3DNULL; + int same =3D 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]; +=20 + if( parse_cmdline_cmp(argc, argv, &inParam) =3D=3D 1 ) + { +@@ -154,9 +154,9 @@ int main(int argc, char **argv) +=20 + while (fgets(lbase, sizeof(lbase), fbase) && fgets(ltest,sizeof(ltest),= ftest)) + { +- int nbase =3D sscanf(lbase, "%255[^\r\n]", strbase); +- int ntest =3D sscanf(ltest, "%255[^\r\n]", strtest); +- assert( nbase !=3D 255 && ntest !=3D 255 ); ++ int nbase =3D sscanf(lbase, "%511[^\r\n]", strbase); ++ int ntest =3D sscanf(ltest, "%511[^\r\n]", strtest); ++ assert( nbase !=3D 511 && ntest !=3D 511 ); + if( nbase !=3D 1 || ntest !=3D 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 @TEM= P_PATH@/issue726.png + # issue 775 + !opj_decompress -i @INPUT_NR_PATH@/issue775.j2k -o @TEMP_PATH@/issue775.p= ng + !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.p= ng +--=20 +2.10.0 + --=20 2.10.0 --mYCpIKhGyMATD0i+-- --7ZAtKRhVyVSsbBD2 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJX0vnGAAoJECZG+jC6yn8IzE4P/3s7LJmvZue4CU6Z8lqjEiT/ ZKoa61TC8MBacgxAWHlIYJmS0gqLlPX+ovcWMGPC0MLzBVTTfkBeYzwaZ47vu/l6 Tc926mUZ7uFWSjzcunN8RnWZX6Jw79RAAZxn4nOLGQxAd7Zm8djLBIlBHgKeBWIz ofAwxw7ZAh3ZUm5trNdK76s8RKcyq+3rj0A63hYU9sGL4DZDcUd37Vy9ialQqJ5A A9uN0TpBwND+A3MOQT+EbK1deipZKVopd6awI4aGgbbT6bvlAMFsgQvZRI7CEwLc kz8EApc9KWxJQknD7jVxoF3C7ymJOq611VjPvgXT05K4JDhcPRI4aCCTNOERekOi kb3xaYRmQ5w05DpgeWj/p4XyGodgN/KM/168mn9eD7bNpT8LNLwkPUSK6CriXWbE h1uXn6quzo8mP4HgsmnZLEFGhGE35nlnNaTqVf1ueKnOYG1oFDhZ5zFlcSylPN/5 cM2LTebl0YKQlnhmC7WUoC5l37QEcto34jvB4sv3derPM92afYkIBbQW9FEZxgit fhkXUMs+zbYtSfCx+fkPRHEHK5BYswMqKEexdIhWc/mWImheEF5SFPfh1GAh9Ygg LVu0yhH0nhmOpyHWx5qhbnp1MpReLELoKIR56hDgGKGdpZiuJ+mxs1qw5AuqmdtT U91LlIrPMr5i9s6kNgV7 =jV5P -----END PGP SIGNATURE----- --7ZAtKRhVyVSsbBD2--