[gentoo-commits] repo/gentoo:master commit in: media-libs/lcms/, media-libs/lcms/files/

[Andreas Hüttel]

commit:     d0b5a9d997ee762c077790a87a48bc611d765d74
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 27 20:58:11 2017 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Jan 27 20:58:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0b5a9d9

media-libs/lcms: Add patch for out-of-bounds read in Type_MLU_Read() (CVE-2016-10165), bug 591452

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../lcms/files/lcms-2.8-CVE-2016-10165.patch       | 22 ++++++++++
 media-libs/lcms/lcms-2.8-r1.ebuild                 | 51 ++++++++++++++++++++++
 2 files changed, 73 insertions(+)

diff --git a/media-libs/lcms/files/lcms-2.8-CVE-2016-10165.patch b/media-libs/lcms/files/lcms-2.8-CVE-2016-10165.patch
new file mode 100644
index 00000000..b380cf4
--- /dev/null
+++ b/media-libs/lcms/files/lcms-2.8-CVE-2016-10165.patch
@@ -0,0 +1,22 @@
+From 5ca71a7bc18b6897ab21d815d15e218e204581e2 Mon Sep 17 00:00:00 2001
+From: Marti <marti.maria@×××××××××××××.com>
+Date: Mon, 15 Aug 2016 23:31:39 +0200
+Subject: [PATCH] Added an extra check to MLU bounds
+
+Thanks to Ibrahim el-sayed for spotting the bug
+---
+ src/cmstypes.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/cmstypes.c b/src/cmstypes.c
+index cb61860..c7328b9 100644
+--- a/src/cmstypes.c
++++ b/src/cmstypes.c
+@@ -1460,6 +1460,7 @@ void *Type_MLU_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsU
+ 
+         // Check for overflow
+         if (Offset < (SizeOfHeader + 8)) goto Error;
++        if ((Offset + Len) > SizeOfTag + 8) goto Error;
+ 
+         // True begin of the string
+         BeginOfThisString = Offset - SizeOfHeader - 8;

diff --git a/media-libs/lcms/lcms-2.8-r1.ebuild b/media-libs/lcms/lcms-2.8-r1.ebuild
new file mode 100644
index 00000000..10208ae
--- /dev/null
+++ b/media-libs/lcms/lcms-2.8-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+AUTOTOOLS_PRUNE_LIBTOOL_FILES="modules"
+inherit eutils multilib-minimal
+
+DESCRIPTION="A lightweight, speed optimized color management engine"
+HOMEPAGE="http://www.littlecms.com/"
+SRC_URI="mirror://sourceforge/${PN}/lcms2-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc jpeg static-libs +threads test tiff zlib"
+
+RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-4.0.3-r6:0=[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20130224-r10
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/lcms2-${PV}
+
+PATCHES=(
+	"${FILESDIR}/${P}-CVE-2016-10165.patch"
+)
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_with jpeg)
+		$(use_with tiff)
+		$(use_with zlib)
+		$(use_with threads)
+	)
+	ECONF_SOURCE="${S}" \
+	econf ${myeconfargs[@]}
+}
+
+multilib_src_install_all() {
+	find "${ED}" \( -name "*.la" -o -name "*.a" \) -delete || die
+
+	if use doc; then
+		docinto pdf
+		dodoc doc/*.pdf
+	fi
+}