diff options
| author | drochner <drochner@pkgsrc.org> | 2011-03-24 12:04:57 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2011-03-24 12:04:57 +0000 |
| commit | 40d3602d0f85a03f7d7d195a21cf3d695eb6ece6 (patch) | |
| tree | 3765be3ebc07b16dad88fe823011b37116582041 /sysutils | |
| parent | a058b0578db0c9b71ad86056a90e78a42abec66a (diff) | |
| download | pkgsrc-40d3602d0f85a03f7d7d195a21cf3d695eb6ece6.tar.gz | |
add patch from upstream (manually, due to changed #ifdefs and indentation)
to fix possible crashes triggered by 64-bit guests (found by
Cherry G. Mathew, CVE-2011-1166)
bump PKGREV
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/xenkernel33/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/xenkernel33/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/xenkernel33/patches/patch-ac | 18 |
3 files changed, 22 insertions, 3 deletions
diff --git a/sysutils/xenkernel33/Makefile b/sysutils/xenkernel33/Makefile index 2ba2c879c3b..0c99f4ead92 100644 --- a/sysutils/xenkernel33/Makefile +++ b/sysutils/xenkernel33/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.12 2010/12/07 18:44:25 bouyer Exp $ +# $NetBSD: Makefile,v 1.13 2011/03/24 12:04:57 drochner Exp $ # VERSION= 3.3.2 DISTNAME= xen-${VERSION} PKGNAME= xenkernel33-${VERSION} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/ EXTRACT_SUFX= .tar.gz diff --git a/sysutils/xenkernel33/distinfo b/sysutils/xenkernel33/distinfo index fea08b3ad51..1a234aec8b4 100644 --- a/sysutils/xenkernel33/distinfo +++ b/sysutils/xenkernel33/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.10 2010/12/07 18:44:25 bouyer Exp $ +$NetBSD: distinfo,v 1.11 2011/03/24 12:04:57 drochner Exp $ SHA1 (xen-3.3.2.tar.gz) = 7f438e73ac81b25cf5e1570709e87001066bafe4 RMD160 (xen-3.3.2.tar.gz) = 28faa56286f2a418e35dcba6079570ea871d6c7b Size (xen-3.3.2.tar.gz) = 11357576 bytes SHA1 (patch-aa) = 0d11c758ad0a0ca657bf2e0f89ca23ff67b76bb7 SHA1 (patch-ab) = bba70c6a0f884a4bbfd2ce56e41ce0d649300edc +SHA1 (patch-ac) = ed1dc87e4f1d80112befc63372bc91ee621f57e6 diff --git a/sysutils/xenkernel33/patches/patch-ac b/sysutils/xenkernel33/patches/patch-ac new file mode 100644 index 00000000000..8a4210e9f3d --- /dev/null +++ b/sysutils/xenkernel33/patches/patch-ac @@ -0,0 +1,18 @@ +$NetBSD: patch-ac,v 1.1 2011/03/24 12:04:57 drochner Exp $ + +CVE-2011-1166 + +--- xen/arch/x86/domain.c.orig 2009-08-06 12:56:41.000000000 +0000 ++++ xen/arch/x86/domain.c +@@ -680,6 +680,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 |