From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: Re: [PATCH 1/2] gnu: openjpeg-2.*: Fix CVE-2016-7163. Date: Fri, 9 Sep 2016 03:59:09 -0400 Message-ID: <20160909075909.GA7159@jasmine> References: <27adc51d1fc250e1900d84d32f7e73d6bf67e04a.1473400918.git.leo@famulari.name> <20160909071557.GA5507@macbook42.flashner.co.il> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="24zk1gE8NUlDmwG9" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:48785) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1biGid-0000gB-At for guix-devel@gnu.org; Fri, 09 Sep 2016 03:59:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1biGiX-00072u-Mt for guix-devel@gnu.org; Fri, 09 Sep 2016 03:59:26 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:42782) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1biGiV-0006yQ-JH for guix-devel@gnu.org; Fri, 09 Sep 2016 03:59:21 -0400 Content-Disposition: inline In-Reply-To: <20160909071557.GA5507@macbook42.flashner.co.il> 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: Efraim Flashner Cc: guix-devel@gnu.org --24zk1gE8NUlDmwG9 Content-Type: multipart/mixed; boundary="h31gzZEtNLTqOjlF" Content-Disposition: inline --h31gzZEtNLTqOjlF Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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/pa= ckages/patches/openjpeg-CVE-2016-7163.patch [...] > Was from here down put/left here intentionally? It looks out of place >=20 > > +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) > > + > > --=20 > > 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. --h31gzZEtNLTqOjlF Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-gnu-openjpeg-2.-Fix-CVE-2016-7163.patch" Content-Transfer-Encoding: quoted-printable =46rom 040531530913dbf26ce42ad27e1914f4d1683bd3 Mon Sep 17 00:00:00 2001 =46rom: Leo Famulari 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 =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 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")))))) =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 --h31gzZEtNLTqOjlF-- --24zk1gE8NUlDmwG9 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJX0mvJAAoJECZG+jC6yn8IQ8QQAIiBVxTE+m1KCA5rISG/y2Ko uFwvvtRGqcIjx68LH3MDleWYffKgnP9eWen86/8g0rZVXpfO9UemPgTxDnU7N30G ggU/eoR41sicFx3Zi50wgEVw/6PDWDYsYRGM7M3flRaFPHGw+FCG+yA2bfuCZdqZ rIS6SQeRPnTj+2P/EbAlaBH0r9uVm6dxBSVONO2yhbT0iiLE/tSU27HYqZVAzhEf WCiiYshmQS250rTjTXHIVD1X9iYSPc5Y+cSEc87+dQY2K02s4bLYKAd+BGxMHrxQ jydh7V+5xFDHcI0WUkWtqYWtdYVCXGfPp6UrgZV6vi6qdXM2XEy4zDtY82YtzbGF Nl9Q+zXklleIIrnL9AyrvKyXJwpMuX/7gqfJ7yV8AWUcNFZOyhavMTEuWGrNU9ok v9ZWtFpZgc/UYH+cY8JzOSc0h+Xdv9yPdKR4DNYfIbN64m1+AEuBf/6r324UGBmp ZetbJtR7kgLrYM0QjpsmzOoRIHSX2BsFac4aJ3x2dFtpE2SGHnAUsVKcLJgTGHNm PsxwYSFBJxRLA8J2ekubGMs/TJ5sUuV1CtChf9RveQK+Zz+xWFFpUVxmv9xyoh2H IU4QLoxX4vDLu+k6X0o7QCXIoRZtkVWORispGRDnipiAmuGLKSOyi9okyLrDd0gd HUSmZh1sKLtvinIWRyz2 =kQfV -----END PGP SIGNATURE----- --24zk1gE8NUlDmwG9--