Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 381397A21A for ; Mon, 20 Mar 2017 18:11:12 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id D7E6F855E0; Mon, 20 Mar 2017 18:11:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 69EA3855C8 for ; Mon, 20 Mar 2017 18:11:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 9l4cNXFXXRvA for ; Mon, 20 Mar 2017 18:11:10 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id DE1FD8556F for ; Mon, 20 Mar 2017 18:11:10 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D93E6FBE4; Mon, 20 Mar 2017 18:11:10 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_149003347053440" MIME-Version: 1.0 Date: Mon, 20 Mar 2017 18:11:10 +0000 From: "Manuel Bouyer" Subject: CVS commit: pkgsrc/sysutils/xenkernel45 To: pkgsrc-changes@NetBSD.org Reply-To: bouyer@netbsd.org X-Mailer: log_accum Message-Id: <20170320181110.D93E6FBE4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_149003347053440 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bouyer Date: Mon Mar 20 18:11:10 UTC 2017 Modified Files: pkgsrc/sysutils/xenkernel45: Makefile distinfo Added Files: pkgsrc/sysutils/xenkernel45/patches: patch-XSA-207 Log Message: Apply upstream patch for XSA-207. Bump PKGREVISION To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 pkgsrc/sysutils/xenkernel45/Makefile cvs rdiff -u -r1.21 -r1.22 pkgsrc/sysutils/xenkernel45/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/xenkernel45/patches/patch-XSA-207 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_149003347053440 Content-Disposition: inline Content-Length: 3130 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/xenkernel45/Makefile diff -u pkgsrc/sysutils/xenkernel45/Makefile:1.28 pkgsrc/sysutils/xenkernel45/Makefile:1.29 --- pkgsrc/sysutils/xenkernel45/Makefile:1.28 Tue Feb 14 21:36:15 2017 +++ pkgsrc/sysutils/xenkernel45/Makefile Mon Mar 20 18:11:10 2017 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.28 2017/02/14 21:36:15 joerg Exp $ +# $NetBSD: Makefile,v 1.29 2017/03/20 18:11:10 bouyer Exp $ VERSION= 4.5.5 DISTNAME= xen-${VERSION} PKGNAME= xenkernel45-${VERSION} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= sysutils MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/ Index: pkgsrc/sysutils/xenkernel45/distinfo diff -u pkgsrc/sysutils/xenkernel45/distinfo:1.21 pkgsrc/sysutils/xenkernel45/distinfo:1.22 --- pkgsrc/sysutils/xenkernel45/distinfo:1.21 Wed Dec 21 15:36:08 2016 +++ pkgsrc/sysutils/xenkernel45/distinfo Mon Mar 20 18:11:10 2017 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.21 2016/12/21 15:36:08 bouyer Exp $ +$NetBSD: distinfo,v 1.22 2017/03/20 18:11:10 bouyer Exp $ SHA1 (xen-4.5.5.tar.gz) = 4073d411c72d3298baacfc15577b92b9ae577073 RMD160 (xen-4.5.5.tar.gz) = 34132ab04752dc594fbdc1404c95f402b7bbbe39 @@ -14,6 +14,7 @@ SHA1 (patch-XSA-196-2) = 81b1d46f3ec8a3c SHA1 (patch-XSA-200) = 37254653e3f9016de0440047465fddce7e9b1874 SHA1 (patch-XSA-202) = 52cb1da3bb078f6b7574f606b8c9cacdf24f6518 SHA1 (patch-XSA-204) = 4d5616f418e3ea010af4cb9e5d1ad14c8adcbf1c +SHA1 (patch-XSA-207) = e567afa1999bdb12800e7df43d5fdf8564d67fb1 SHA1 (patch-xen_Makefile) = 750d0c8d4fea14d3ef3f872de5242a1f5104cbbe SHA1 (patch-xen_arch_x86_Rules.mk) = 7b0894ba7311edb02118a021671f304cf3872154 SHA1 (patch-xen_common_page__alloc.c) = c4d606de1cada8cf89b5abd16efada3d58c68a03 Added files: Index: pkgsrc/sysutils/xenkernel45/patches/patch-XSA-207 diff -u /dev/null pkgsrc/sysutils/xenkernel45/patches/patch-XSA-207:1.1 --- /dev/null Mon Mar 20 18:11:10 2017 +++ pkgsrc/sysutils/xenkernel45/patches/patch-XSA-207 Mon Mar 20 18:11:10 2017 @@ -0,0 +1,33 @@ +$NetBSD: patch-XSA-207,v 1.1 2017/03/20 18:11:10 bouyer Exp $ + +From: Oleksandr Tyshchenko +Subject: IOMMU: always call teardown callback + +There is a possible scenario when (d)->need_iommu remains unset +during guest domain execution. For example, when no devices +were assigned to it. Taking into account that teardown callback +is not called when (d)->need_iommu is unset we might have unreleased +resourses after destroying domain. + +So, always call teardown callback to roll back actions +that were performed in init callback. + +This is XSA-207. + +Signed-off-by: Oleksandr Tyshchenko +Reviewed-by: Jan Beulich +Tested-by: Jan Beulich +Tested-by: Julien Grall + +--- xen/drivers/passthrough/iommu.c.orig ++++ xen/drivers/passthrough/iommu.c +@@ -244,8 +244,7 @@ void iommu_domain_destroy(struct domain + if ( !iommu_enabled || !dom_iommu(d)->platform_ops ) + return; + +- if ( need_iommu(d) ) +- iommu_teardown(d); ++ iommu_teardown(d); + + arch_iommu_domain_destroy(d); + } --_----------=_149003347053440--