Sat Sep 10 23:34:16 2011 UTC ()
Pullup ticket #3520 - requested by bouyer
sysutils/xenkernel3: security patch
sysutils/xenkernel33: security patch

Revisions pulled up:
- sysutils/xenkernel3/Makefile                                  1.21
- sysutils/xenkernel3/distinfo                                  1.15
- sysutils/xenkernel3/patches/patch-SA45835                     1.1
- sysutils/xenkernel33/Makefile                                 1.15
- sysutils/xenkernel33/distinfo                                 1.14
- sysutils/xenkernel33/patches/patch-SA45835                    1.1

---
   Module Name:	pkgsrc
   Committed By:	bouyer
   Date:		Sat Sep 10 18:35:51 UTC 2011

   Modified Files:
   	pkgsrc/sysutils/xenkernel3: Makefile distinfo
   	pkgsrc/sysutils/xenkernel33: Makefile distinfo
   Added Files:
   	pkgsrc/sysutils/xenkernel3/patches: patch-SA45835
   	pkgsrc/sysutils/xenkernel33/patches: patch-SA45835

   Log Message:
   Apply patch from http://www.openwall.com/lists/oss-security/2011/09/02/2,
   fixing SA45835.
   Bump pkgrevision


(tron)
diff -r1.20 -r1.20.4.1 pkgsrc/sysutils/xenkernel3/Makefile
diff -r1.13 -r1.13.4.1 pkgsrc/sysutils/xenkernel3/distinfo
diff -r0 -r1.1.2.2 pkgsrc/sysutils/xenkernel3/patches/patch-SA45835
diff -r1.14 -r1.14.2.1 pkgsrc/sysutils/xenkernel33/Makefile
diff -r1.12 -r1.12.2.1 pkgsrc/sysutils/xenkernel33/distinfo
diff -r0 -r1.1.2.2 pkgsrc/sysutils/xenkernel33/patches/patch-SA45835
cvs diff -r1.20 -r1.20.4.1 pkgsrc/sysutils/xenkernel3/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/xenkernel3/Attic/Makefile 2011/03/24 12:43:53 1.20
+++ pkgsrc/sysutils/xenkernel3/Attic/Makefile 2011/09/10 23:34:16 1.20.4.1
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.20 2011/03/24 12:43:53 drochner Exp $ 1# $NetBSD: Makefile,v 1.20.4.1 2011/09/10 23:34:16 tron Exp $
2# 2#
3 3
4VERSION= 3.1.4 4VERSION= 3.1.4
5DISTNAME= xen-${VERSION} 5DISTNAME= xen-${VERSION}
6PKGNAME= xenkernel3-${VERSION} 6PKGNAME= xenkernel3-${VERSION}
7PKGREVISION= 5 7PKGREVISION= 6
8CATEGORIES= sysutils 8CATEGORIES= sysutils
9MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/ 9MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/
10 10
11MAINTAINER= bouyer@NetBSD.org 11MAINTAINER= bouyer@NetBSD.org
12HOMEPAGE= http://xen.org/ 12HOMEPAGE= http://xen.org/
13COMMENT= Xen3 Kernel 13COMMENT= Xen3 Kernel
14 14
15ONLY_FOR_PLATFORM= Linux-2.[46]*-i386 NetBSD-*-i386 Linux-2.[46]*-x86_64 NetBSD-*-x86_64 15ONLY_FOR_PLATFORM= Linux-2.[46]*-i386 NetBSD-*-i386 Linux-2.[46]*-x86_64 NetBSD-*-x86_64
16CONFLICTS= xenkernel30-[0-9]* 16CONFLICTS= xenkernel30-[0-9]*
17 17
18 18
19WRKSRC= ${WRKDIR}/xen-${VERSION} 19WRKSRC= ${WRKDIR}/xen-${VERSION}
20 20
cvs diff -r1.13 -r1.13.4.1 pkgsrc/sysutils/xenkernel3/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/xenkernel3/Attic/distinfo 2011/03/24 12:43:53 1.13
+++ pkgsrc/sysutils/xenkernel3/Attic/distinfo 2011/09/10 23:34:16 1.13.4.1
@@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
1$NetBSD: distinfo,v 1.13 2011/03/24 12:43:53 drochner Exp $ 1$NetBSD: distinfo,v 1.13.4.1 2011/09/10 23:34:16 tron Exp $
2 2
3SHA1 (xen-3.1.4.tar.gz) = 0d784662776239195df10b3f29d40350f9d0644d 3SHA1 (xen-3.1.4.tar.gz) = 0d784662776239195df10b3f29d40350f9d0644d
4RMD160 (xen-3.1.4.tar.gz) = c02ad2bd64e6306b127a4f37a8aa370dadc11859 4RMD160 (xen-3.1.4.tar.gz) = c02ad2bd64e6306b127a4f37a8aa370dadc11859
5Size (xen-3.1.4.tar.gz) = 6894493 bytes 5Size (xen-3.1.4.tar.gz) = 6894493 bytes
 6SHA1 (patch-SA45835) = 7af53cb3da8720954242c4c90165bceef362c184
6SHA1 (patch-aa) = 1be644e7edd3735c2850d3e581002f53bd50eb59 7SHA1 (patch-aa) = 1be644e7edd3735c2850d3e581002f53bd50eb59
7SHA1 (patch-ac) = 4c237984832ef5532e0451845e8075b95744e48d 8SHA1 (patch-ac) = 4c237984832ef5532e0451845e8075b95744e48d
8SHA1 (patch-ba) = cadfa6f2626e95c9ccb85ae7e3a8a7f318ea343f 9SHA1 (patch-ba) = cadfa6f2626e95c9ccb85ae7e3a8a7f318ea343f
9SHA1 (patch-bb) = 7338e5a512c909d4b043654dab882761de274f94 10SHA1 (patch-bb) = 7338e5a512c909d4b043654dab882761de274f94
10SHA1 (patch-bc) = fa35699da6ad2a4950418a02432c2ccdb5d34844 11SHA1 (patch-bc) = fa35699da6ad2a4950418a02432c2ccdb5d34844
11SHA1 (patch-bd) = 2a07955b1285d288458066813f8ebc801b8038c1 12SHA1 (patch-bd) = 2a07955b1285d288458066813f8ebc801b8038c1
12SHA1 (patch-cw) = 83a0f34dac9ba9a465c7362d4de6706afb84d688 13SHA1 (patch-cw) = 83a0f34dac9ba9a465c7362d4de6706afb84d688
13SHA1 (patch-da) = 6db74e00d15615e71936fa8637a05159f378b454 14SHA1 (patch-da) = 6db74e00d15615e71936fa8637a05159f378b454
14SHA1 (patch-db) = 8e7b563fd816669fd39e1e8bf5137b5937060968 15SHA1 (patch-db) = 8e7b563fd816669fd39e1e8bf5137b5937060968
15SHA1 (patch-dc) = 606ad2af582b88ddfd250b952831af9d3b2b1f5d 16SHA1 (patch-dc) = 606ad2af582b88ddfd250b952831af9d3b2b1f5d
File Added: pkgsrc/sysutils/xenkernel3/patches/Attic/patch-SA45835
$NetBSD: patch-SA45835,v 1.1.2.2 2011/09/10 23:34:16 tron Exp $

--- xen/include/asm-x86/x86_64/uaccess.h.orig	2008-04-25 15:03:12.000000000 +0200
+++ xen/include/asm-x86/x86_64/uaccess.h	2011-09-10 20:26:42.000000000 +0200
@@ -8,7 +8,7 @@
  * non-canonical address (and thus fault) before ever reaching VIRT_START.
  */
 #define __addr_ok(addr) \
-    (((unsigned long)(addr) < (1UL<<48)) || \
+    (((unsigned long)(addr) < (1UL<<47)) || \
      ((unsigned long)(addr) >= HYPERVISOR_VIRT_END))
 
 #define access_ok(addr, size) (__addr_ok(addr))
cvs diff -r1.14 -r1.14.2.1 pkgsrc/sysutils/xenkernel33/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/xenkernel33/Attic/Makefile 2011/04/04 09:07:06 1.14
+++ pkgsrc/sysutils/xenkernel33/Attic/Makefile 2011/09/10 23:34:16 1.14.2.1
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.14 2011/04/04 09:07:06 hauke Exp $ 1# $NetBSD: Makefile,v 1.14.2.1 2011/09/10 23:34:16 tron Exp $
2# 2#
3 3
4VERSION= 3.3.2 4VERSION= 3.3.2
5DISTNAME= xen-${VERSION} 5DISTNAME= xen-${VERSION}
6PKGNAME= xenkernel33-${VERSION} 6PKGNAME= xenkernel33-${VERSION}
7PKGREVISION= 3 7PKGREVISION= 4
8CATEGORIES= sysutils 8CATEGORIES= sysutils
9MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/ 9MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/
10EXTRACT_SUFX= .tar.gz 10EXTRACT_SUFX= .tar.gz
11 11
12MAINTAINER= cegger@NetBSD.org 12MAINTAINER= cegger@NetBSD.org
13HOMEPAGE= http://xen.org/ 13HOMEPAGE= http://xen.org/
14COMMENT= Xen 3.3.2 Kernel 14COMMENT= Xen 3.3.2 Kernel
15 15
16PKG_DESTDIR_SUPPORT= user-destdir 16PKG_DESTDIR_SUPPORT= user-destdir
17 17
18ONLY_FOR_PLATFORM= Linux-2.6*-i386 Linux-2.6*-x86_64 18ONLY_FOR_PLATFORM= Linux-2.6*-i386 Linux-2.6*-x86_64
19ONLY_FOR_PLATFORM+= NetBSD-[5-9].*-x86_64 NetBSD-[5-9].*-i386 19ONLY_FOR_PLATFORM+= NetBSD-[5-9].*-x86_64 NetBSD-[5-9].*-i386
20 20
cvs diff -r1.12 -r1.12.2.1 pkgsrc/sysutils/xenkernel33/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/xenkernel33/Attic/distinfo 2011/04/04 09:07:06 1.12
+++ pkgsrc/sysutils/xenkernel33/Attic/distinfo 2011/09/10 23:34:16 1.12.2.1
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.12 2011/04/04 09:07:06 hauke Exp $ 1$NetBSD: distinfo,v 1.12.2.1 2011/09/10 23:34:16 tron Exp $
2 2
3SHA1 (xen-3.3.2.tar.gz) = 7f438e73ac81b25cf5e1570709e87001066bafe4 3SHA1 (xen-3.3.2.tar.gz) = 7f438e73ac81b25cf5e1570709e87001066bafe4
4RMD160 (xen-3.3.2.tar.gz) = 28faa56286f2a418e35dcba6079570ea871d6c7b 4RMD160 (xen-3.3.2.tar.gz) = 28faa56286f2a418e35dcba6079570ea871d6c7b
5Size (xen-3.3.2.tar.gz) = 11357576 bytes 5Size (xen-3.3.2.tar.gz) = 11357576 bytes
 6SHA1 (patch-SA45835) = 7d27c26ba947354bb5e279f3add9eb073a151477
6SHA1 (patch-aa) = 0d11c758ad0a0ca657bf2e0f89ca23ff67b76bb7 7SHA1 (patch-aa) = 0d11c758ad0a0ca657bf2e0f89ca23ff67b76bb7
7SHA1 (patch-ab) = bba70c6a0f884a4bbfd2ce56e41ce0d649300edc 8SHA1 (patch-ab) = bba70c6a0f884a4bbfd2ce56e41ce0d649300edc
8SHA1 (patch-ac) = ed1dc87e4f1d80112befc63372bc91ee621f57e6 9SHA1 (patch-ac) = ed1dc87e4f1d80112befc63372bc91ee621f57e6
9SHA1 (patch-ad) = e53ac3abf2a6a10c60cf288b994b3cf52a0d6486 10SHA1 (patch-ad) = e53ac3abf2a6a10c60cf288b994b3cf52a0d6486
File Added: pkgsrc/sysutils/xenkernel33/patches/Attic/patch-SA45835
$NetBSD: patch-SA45835,v 1.1.2.2 2011/09/10 23:34:16 tron Exp $

--- xen/include/asm-x86/x86_64/uaccess.h.orig	2011-09-10 20:10:52.000000000 +0200
+++ xen/include/asm-x86/x86_64/uaccess.h	2011-09-10 20:11:28.000000000 +0200
@@ -19,7 +19,7 @@
  * non-canonical address (and thus fault) before ever reaching VIRT_START.
  */
 #define __addr_ok(addr) \
-    (((unsigned long)(addr) < (1UL<<48)) || \
+    (((unsigned long)(addr) < (1UL<<47)) || \
      ((unsigned long)(addr) >= HYPERVISOR_VIRT_END))
 
 #define access_ok(addr, size) \