summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sysutils/xenkernel3/Makefile4
-rw-r--r--sysutils/xenkernel3/distinfo3
-rw-r--r--sysutils/xenkernel3/patches/patch-ac18
3 files changed, 22 insertions, 3 deletions
diff --git a/sysutils/xenkernel3/Makefile b/sysutils/xenkernel3/Makefile
index 5a35594e27a..0352ba26f98 100644
--- a/sysutils/xenkernel3/Makefile
+++ b/sysutils/xenkernel3/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2010/12/07 18:43:48 bouyer Exp $
+# $NetBSD: Makefile,v 1.20 2011/03/24 12:43:53 drochner Exp $
#
VERSION= 3.1.4
DISTNAME= xen-${VERSION}
PKGNAME= xenkernel3-${VERSION}
-PKGREVISION= 4
+PKGREVISION= 5
CATEGORIES= sysutils
MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/
diff --git a/sysutils/xenkernel3/distinfo b/sysutils/xenkernel3/distinfo
index e8a60a5df3c..4ea9fb6c4ea 100644
--- a/sysutils/xenkernel3/distinfo
+++ b/sysutils/xenkernel3/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.12 2010/12/07 18:43:48 bouyer Exp $
+$NetBSD: distinfo,v 1.13 2011/03/24 12:43:53 drochner Exp $
SHA1 (xen-3.1.4.tar.gz) = 0d784662776239195df10b3f29d40350f9d0644d
RMD160 (xen-3.1.4.tar.gz) = c02ad2bd64e6306b127a4f37a8aa370dadc11859
Size (xen-3.1.4.tar.gz) = 6894493 bytes
SHA1 (patch-aa) = 1be644e7edd3735c2850d3e581002f53bd50eb59
+SHA1 (patch-ac) = 4c237984832ef5532e0451845e8075b95744e48d
SHA1 (patch-ba) = cadfa6f2626e95c9ccb85ae7e3a8a7f318ea343f
SHA1 (patch-bb) = 7338e5a512c909d4b043654dab882761de274f94
SHA1 (patch-bc) = fa35699da6ad2a4950418a02432c2ccdb5d34844
diff --git a/sysutils/xenkernel3/patches/patch-ac b/sysutils/xenkernel3/patches/patch-ac
new file mode 100644
index 00000000000..f088fdfc14a
--- /dev/null
+++ b/sysutils/xenkernel3/patches/patch-ac
@@ -0,0 +1,18 @@
+$NetBSD: patch-ac,v 1.3 2011/03/24 12:43:53 drochner Exp $
+
+CVE-2011-1166
+
+--- xen/arch/x86/domain.c.orig 2008-04-25 13:03:12.000000000 +0000
++++ xen/arch/x86/domain.c
+@@ -701,6 +701,11 @@ int arch_set_info_guest(
+
+ v->arch.guest_table_user = pagetable_from_pfn(cr3_pfn);
+ }
++ else if ( !(flags & VGCF_in_kernel) )
++ {
++ destroy_gdt(v);
++ return -EINVAL;
++ }
+ #endif
+ }
+ #ifdef CONFIG_COMPAT