diff options
| author | bouyer <bouyer> | 2017-03-20 18:11:10 +0000 |
|---|---|---|
| committer | bouyer <bouyer> | 2017-03-20 18:11:10 +0000 |
| commit | 1ef5483ce7ece661b455e57ffcdd8ade7b795a9f (patch) | |
| tree | dda714393ecbad0fd82c089236c86f0712fe4683 /sysutils | |
| parent | 8eed678678ea682d35ea35ff6570855bbc7dc0fc (diff) | |
| download | pkgsrc-1ef5483ce7ece661b455e57ffcdd8ade7b795a9f.tar.gz | |
Apply upstream patch for XSA-207. Bump PKGREVISION
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/xenkernel45/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/xenkernel45/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/xenkernel45/patches/patch-XSA-207 | 33 |
3 files changed, 37 insertions, 3 deletions
diff --git a/sysutils/xenkernel45/Makefile b/sysutils/xenkernel45/Makefile index f3cb801c35e..bc2e017323c 100644 --- a/sysutils/xenkernel45/Makefile +++ b/sysutils/xenkernel45/Makefile @@ -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}/ diff --git a/sysutils/xenkernel45/distinfo b/sysutils/xenkernel45/distinfo index 84548b1ed18..46375104530 100644 --- a/sysutils/xenkernel45/distinfo +++ b/sysutils/xenkernel45/distinfo @@ -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) = 81b1d46f3ec8a3c5133f6a923fee0ab1b2b1c6a0 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 diff --git a/sysutils/xenkernel45/patches/patch-XSA-207 b/sysutils/xenkernel45/patches/patch-XSA-207 new file mode 100644 index 00000000000..2df54bc1f44 --- /dev/null +++ b/sysutils/xenkernel45/patches/patch-XSA-207 @@ -0,0 +1,33 @@ +$NetBSD: patch-XSA-207,v 1.1 2017/03/20 18:11:10 bouyer Exp $ + +From: Oleksandr Tyshchenko <olekstysh@gmail.com> +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 <olekstysh@gmail.com> +Reviewed-by: Jan Beulich <jbeulich@suse.com> +Tested-by: Jan Beulich <jbeulich@suse.com> +Tested-by: Julien Grall <julien.grall@arm.com> + +--- 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); + } |