From owner-svn-ports-branches@freebsd.org Sun Dec 20 02:12:39 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AE569A4CA4E; Sun, 20 Dec 2015 02:12:39 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 620E71374; Sun, 20 Dec 2015 02:12:39 +0000 (UTC) (envelope-from novel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBK2Ccos042616; Sun, 20 Dec 2015 02:12:38 GMT (envelope-from novel@FreeBSD.org) Received: (from novel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBK2Ccha042614; Sun, 20 Dec 2015 02:12:38 GMT (envelope-from novel@FreeBSD.org) Message-Id: <201512200212.tBK2Ccha042614@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: novel set sender to novel@FreeBSD.org using -f From: Roman Bogorodskiy Date: Sun, 20 Dec 2015 02:12:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r404038 - in branches/2015Q4/devel/libvirt: . 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-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Dec 2015 02:12:39 -0000 Author: novel Date: Sun Dec 20 02:12:38 2015 New Revision: 404038 URL: https://svnweb.freebsd.org/changeset/ports/404038 Log: devel/libvirt: fix CVE-2015-5313 Approved by: ports-secteam (delphij) Added: branches/2015Q4/devel/libvirt/files/patch-CVE-2015-5313 (contents, props changed) Modified: branches/2015Q4/devel/libvirt/Makefile Modified: branches/2015Q4/devel/libvirt/Makefile ============================================================================== --- branches/2015Q4/devel/libvirt/Makefile Sun Dec 20 02:08:38 2015 (r404037) +++ branches/2015Q4/devel/libvirt/Makefile Sun Dec 20 02:12:38 2015 (r404038) @@ -3,7 +3,7 @@ PORTNAME= libvirt PORTVERSION= 1.2.19 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://libvirt.org/sources/ \ ftp://libvirt.org/libvirt/ Added: branches/2015Q4/devel/libvirt/files/patch-CVE-2015-5313 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/devel/libvirt/files/patch-CVE-2015-5313 Sun Dec 20 02:12:38 2015 (r404038) @@ -0,0 +1,26 @@ +--- src/storage/storage_backend_fs.c ++++ src/storage/storage_backend_fs.c +@@ -1,7 +1,7 @@ + /* + * storage_backend_fs.c: storage backend for FS and directory handling + * +- * Copyright (C) 2007-2014 Red Hat, Inc. ++ * Copyright (C) 2007-2015 Red Hat, Inc. + * Copyright (C) 2007-2008 Daniel P. Berrange + * + * This library is free software; you can redistribute it and/or +@@ -1057,6 +1057,14 @@ virStorageBackendFileSystemVolCreate(virConnectPtr conn ATTRIBUTE_UNUSED, + else + vol->type = VIR_STORAGE_VOL_FILE; + ++ /* Volumes within a directory pools are not recursive; do not ++ * allow escape to ../ or a subdir */ ++ if (strchr(vol->name, '/')) { ++ virReportError(VIR_ERR_OPERATION_INVALID, ++ _("volume name '%s' cannot contain '/'"), vol->name); ++ return -1; ++ } ++ + VIR_FREE(vol->target.path); + if (virAsprintf(&vol->target.path, "%s/%s", + pool->def->target.path,