[pkgsrc/trunk]: pkgsrc/sysutils/xenkernel41 add patch from upstream to fix a ...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dabfc0171848
branches:  trunk
changeset: 607350:dabfc0171848
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Fri Aug 10 09:59:47 2012 +0000

description:
add patch from upstream to fix a possible DOS by HVM guests on teardown
(CVE-2012-3433)
bump PKGREV

diffstat:

 sysutils/xenkernel41/Makefile                    |   4 ++--
 sysutils/xenkernel41/distinfo                    |   3 ++-
 sysutils/xenkernel41/patches/patch-CVE-2012-3433 |  15 +++++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diffs (50 lines):

diff -r d062b22c022c -r dabfc0171848 sysutils/xenkernel41/Makefile
--- a/sysutils/xenkernel41/Makefile     Fri Aug 10 08:15:16 2012 +0000
+++ b/sysutils/xenkernel41/Makefile     Fri Aug 10 09:59:47 2012 +0000
@@ -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 -r d062b22c022c -r dabfc0171848 sysutils/xenkernel41/distinfo
--- a/sysutils/xenkernel41/distinfo     Fri Aug 10 08:15:16 2012 +0000
+++ b/sysutils/xenkernel41/distinfo     Fri Aug 10 09:59:47 2012 +0000
@@ -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 -r d062b22c022c -r dabfc0171848 sysutils/xenkernel41/patches/patch-CVE-2012-3433
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/xenkernel41/patches/patch-CVE-2012-3433  Fri Aug 10 09:59:47 2012 +0000
@@ -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));