From owner-svn-ports-all@FreeBSD.ORG Sun Mar 22 19:49:36 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4D96F548; Sun, 22 Mar 2015 19:49:36 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1ED50C70; Sun, 22 Mar 2015 19:49:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2MJnZCA077626; Sun, 22 Mar 2015 19:49:35 GMT (envelope-from johans@FreeBSD.org) Received: (from johans@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2MJnZou077624; Sun, 22 Mar 2015 19:49:35 GMT (envelope-from johans@FreeBSD.org) Message-Id: <201503221949.t2MJnZou077624@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: johans set sender to johans@FreeBSD.org using -f From: Johan van Selst Date: Sun, 22 Mar 2015 19:49:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r381952 - in branches/2015Q1/archivers/rpm4: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Mar 2015 19:49:36 -0000 Author: johans Date: Sun Mar 22 19:49:34 2015 New Revision: 381952 URL: https://svnweb.freebsd.org/changeset/ports/381952 QAT: https://qat.redports.org/buildarchive/r381952/ Log: MFH: r381946 Add security fix for CVE-2014-8118 PR: 198796 Submitted by: Sevan Janiyan Obtained from: https://bugzilla.redhat.com/show_bug.cgi?id=1168715 Approved by: portmgr Added: branches/2015Q1/archivers/rpm4/files/patch-lib_cpio.c - copied unchanged from r381946, head/archivers/rpm4/files/patch-lib_cpio.c Modified: branches/2015Q1/archivers/rpm4/Makefile Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/archivers/rpm4/Makefile ============================================================================== --- branches/2015Q1/archivers/rpm4/Makefile Sun Mar 22 19:49:09 2015 (r381951) +++ branches/2015Q1/archivers/rpm4/Makefile Sun Mar 22 19:49:34 2015 (r381952) @@ -3,7 +3,7 @@ PORTNAME= rpm PORTVERSION= 4.12.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= archivers MASTER_SITES= http://rpm.org/releases/rpm-${PORTVERSION:R:R}.x/ \ ftp://ftp.mirrorservice.org/sites/ftp.rpm.org/pub/rpm/dist/rpm-${PORTVERSION:E}.x/ Copied: branches/2015Q1/archivers/rpm4/files/patch-lib_cpio.c (from r381946, head/archivers/rpm4/files/patch-lib_cpio.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/archivers/rpm4/files/patch-lib_cpio.c Sun Mar 22 19:49:34 2015 (r381952, copy of r381946, head/archivers/rpm4/files/patch-lib_cpio.c) @@ -0,0 +1,15 @@ +Fix for CVE-2014-8118 as found at +https://bugzilla.redhat.com/show_bug.cgi?id=1168715 + +--- lib/cpio.c.orig 2015-03-22 19:29:29.000000000 +0100 ++++ lib/cpio.c 2015-03-22 19:29:30.000000000 +0100 +@@ -399,6 +399,9 @@ int rpmcpioHeaderRead(rpmcpio_t cpio, ch + + GET_NUM_FIELD(hdr.filesize, fsize); + GET_NUM_FIELD(hdr.namesize, nameSize); ++ if (nameSize <= 0 || nameSize > 4096) { ++ return RPMERR_BAD_HEADER; ++ } + + char name[nameSize + 1]; + read = Fread(name, nameSize, 1, cpio->fd);