summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2012-08-10 09:59:47 +0000
committerdrochner <drochner@pkgsrc.org>2012-08-10 09:59:47 +0000
commit463cff3d2eb6f9a61aa4a929f18781a426a05ff1 (patch)
tree7b09ab05b4f9adee243ec3a504d3decae1a497b6 /sysutils
parentc1907a486c6d984c112e1b91cc138a7d1beeb2eb (diff)
downloadpkgsrc-463cff3d2eb6f9a61aa4a929f18781a426a05ff1.tar.gz
add patch from upstream to fix a possible DOS by HVM guests on teardown
(CVE-2012-3433) bump PKGREV
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/xenkernel41/Makefile4
-rw-r--r--sysutils/xenkernel41/distinfo3
-rw-r--r--sysutils/xenkernel41/patches/patch-CVE-2012-343315
3 files changed, 19 insertions, 3 deletions
diff --git a/sysutils/xenkernel41/Makefile b/sysutils/xenkernel41/Makefile
index 27d0e35b8a6..be039f25fd6 100644
--- a/sysutils/xenkernel41/Makefile
+++ b/sysutils/xenkernel41/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2012/08/01 12:28:18 asau Exp $
+# $NetBSD: Makefile,v 1.11 2012/08/10 09:59:47 drochner Exp $
#
VERSION= 4.1.2
DISTNAME= xen-${VERSION}
PKGNAME= xenkernel41-${VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
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 4889455c3e7..b04ad13c858 100644
--- a/sysutils/xenkernel41/distinfo
+++ b/sysutils/xenkernel41/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.8 2012/07/27 18:50:34 drochner Exp $
+$NetBSD: distinfo,v 1.9 2012/08/10 09:59:47 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-CVE-2012-3433) = 51ca4a6427c19dc31ba2bd05e4c09027d52a4ebc
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-3433 b/sysutils/xenkernel41/patches/patch-CVE-2012-3433
new file mode 100644
index 00000000000..b43a309b338
--- /dev/null
+++ b/sysutils/xenkernel41/patches/patch-CVE-2012-3433
@@ -0,0 +1,15 @@
+$NetBSD: patch-CVE-2012-3433,v 1.1 2012/08/10 09:59:47 drochner Exp $
+
+see http://lists.xen.org/archives/html/xen-devel/2012-08/msg00855.html
+
+--- xen/arch/x86/mm/p2m.c.orig 2011-10-20 17:05:48.000000000 +0000
++++ xen/arch/x86/mm/p2m.c
+@@ -2043,6 +2043,8 @@ void p2m_teardown(struct p2m_domain *p2m
+ #ifdef __x86_64__
+ for ( gfn=0; gfn < p2m->max_mapped_pfn; gfn++ )
+ {
++ if ( atomic_read(&d->shr_pages) == 0 )
++ break;
+ mfn = p2m->get_entry(p2m, gfn, &t, &a, p2m_query);
+ if ( mfn_valid(mfn) && (t == p2m_ram_shared) )
+ BUG_ON(mem_sharing_unshare_page(p2m, gfn, MEM_SHARING_DESTROY_GFN));