summaryrefslogtreecommitdiff
path: root/sysutils/xenkernel41
diff options
context:
space:
mode:
authordrochner <drochner>2012-07-27 18:50:34 +0000
committerdrochner <drochner>2012-07-27 18:50:34 +0000
commit2b67c3839780e19b1ff0ab0112b770dedbc6c5d3 (patch)
treeea5e22b1d4aeb74744e326c75533d6491c16d383 /sysutils/xenkernel41
parentd61f83849a9974aea50f774abce6c2a309c0e2c7 (diff)
downloadpkgsrc-2b67c3839780e19b1ff0ab0112b770dedbc6c5d3.tar.gz
add patch from upstream to fix bug in MMIO emulation which can cause
guest crashes by unprivileged users, only for HVM guests, and if MMIO is granted to the user process (CVE-2012-3432) bump PKGREV
Diffstat (limited to 'sysutils/xenkernel41')
-rw-r--r--sysutils/xenkernel41/Makefile4
-rw-r--r--sysutils/xenkernel41/distinfo3
-rw-r--r--sysutils/xenkernel41/patches/patch-CVE-2012-343215
3 files changed, 19 insertions, 3 deletions
diff --git a/sysutils/xenkernel41/Makefile b/sysutils/xenkernel41/Makefile
index c44edc818dd..b1ed5f56946 100644
--- a/sysutils/xenkernel41/Makefile
+++ b/sysutils/xenkernel41/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2012/06/19 20:17:06 bouyer Exp $
+# $NetBSD: Makefile,v 1.8 2012/07/27 18:50:34 drochner Exp $
#
VERSION= 4.1.2
DISTNAME= xen-${VERSION}
PKGNAME= xenkernel41-${VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/
EXTRACT_SUFX= .tar.gz
diff --git a/sysutils/xenkernel41/distinfo b/sysutils/xenkernel41/distinfo
index 4bf0547369e..4889455c3e7 100644
--- a/sysutils/xenkernel41/distinfo
+++ b/sysutils/xenkernel41/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.7 2012/06/12 15:59:04 bouyer Exp $
+$NetBSD: distinfo,v 1.8 2012/07/27 18:50:34 drochner Exp $
SHA1 (xen-4.1.2.tar.gz) = db584cb0a0cc614888d7df3b196d514fdb2edd6e
RMD160 (xen-4.1.2.tar.gz) = 457797ec4be286afbbcad940a9ce04e44f3f40d6
Size (xen-4.1.2.tar.gz) = 10365786 bytes
+SHA1 (patch-CVE-2012-3432) = e85b1adf1c683a1d086410f0c4265ed72a86d7fb
SHA1 (patch-xen_drivers_char_console_c) = 0fe186369602ccffaeec6f4bfbee8bb4298d3ff0
SHA1 (patch-xen_include_xen_stdarg.h) = e9df974a9b783ed442ab17497198432cb9844b70
SHA1 (patch-xsa7-xsa8-xen-4.1) = e48cfd4ae9e7a4d48e059738b3f36074d3982515
diff --git a/sysutils/xenkernel41/patches/patch-CVE-2012-3432 b/sysutils/xenkernel41/patches/patch-CVE-2012-3432
new file mode 100644
index 00000000000..93740b1034c
--- /dev/null
+++ b/sysutils/xenkernel41/patches/patch-CVE-2012-3432
@@ -0,0 +1,15 @@
+$NetBSD: patch-CVE-2012-3432,v 1.1 2012/07/27 18:50:34 drochner Exp $
+
+see http://lists.xen.org/archives/html/xen-devel/2012-07/msg01649.html
+
+--- xen/arch/x86/hvm/io.c.orig 2012-07-27 18:34:15.000000000 +0000
++++ xen/arch/x86/hvm/io.c
+@@ -176,6 +176,8 @@ int handle_mmio(void)
+
+ rc = hvm_emulate_one(&ctxt);
+
++ if ( rc != X86EMUL_RETRY )
++ curr->arch.hvm_vcpu.io_state = HVMIO_none;
+ if ( curr->arch.hvm_vcpu.io_state == HVMIO_awaiting_completion )
+ curr->arch.hvm_vcpu.io_state = HVMIO_handle_mmio_awaiting_completion;
+ else