Fixed security issue, bug 209460. Straight to stable.

Package-Manager: portage-2.1.3.19
RepoMan-Options: --force

4 files changed, 66 insertions, 2 deletions

diff --git a/sys-kernel/openvz-sources/ChangeLog b/sys-kernel/openvz-sources/ChangeLog
index daac549d7199..276d42e46d5b 100644
--- a/sys-kernel/openvz-sources/ChangeLog
+++ b/sys-kernel/openvz-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/openvz-sources
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.83 2008/01/30 08:09:29 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.84 2008/02/13 08:41:15 pva Exp $
+
+*openvz-sources-2.6.18.028.053-r1 (13 Feb 2008)
+
+  13 Feb 2008; <pva@gentoo.org>
+  +files/openvz-sources-2.6.18-ms-splice-access.patch,
+  +openvz-sources-2.6.18.028.053-r1.ebuild:
+  Fixed security issue, bug 209460. Straight to stable.
 
   30 Jan 2008; <pva@gentoo.org> -openvz-sources-2.6.18.028.051.ebuild:
   clean old, vulneralble.
diff --git a/sys-kernel/openvz-sources/Manifest b/sys-kernel/openvz-sources/Manifest
index 2216a2b5bb14..b826fb7d2a96 100644
--- a/sys-kernel/openvz-sources/Manifest
+++ b/sys-kernel/openvz-sources/Manifest
@@ -1,8 +1,10 @@
+AUX openvz-sources-2.6.18-ms-splice-access.patch 712 RMD160 9c9125f4500fefcbd14e36a8ee5f5028bab9f467 SHA1 7c5d45417380edd8e3c3b4f64722791ab0132f19 SHA256 46f19b681afb0d0b101eb92695108e7b60b0b191cbc77bbf56446116e591d7ad
 DIST linux-2.6.18.tar.bz2 41863580 RMD160 f92283f956880676bfb1f1d5288325461e4e02e7 SHA1 178f7d5bb3af0978d42b37651b8753323c7129c2 SHA256 c95280ff6c5d2a17788f7cc582d23ae8a9a7ba3f202ec6e4238eaadfce7c163d
 DIST linux-2.6.22.tar.bz2 45119878 RMD160 c4b2ca5ee8e71c0f8f1c95f3c9c5f261f2785912 SHA1 39401f195a618f397312d6d84ff9aebe28d99381 SHA256 73c10604c53f1a6ee65ef805293d23903696f8cef864f42d7de9506f0d2ba4c7
 DIST patch-ovz005.1-combined.gz 877023 RMD160 8aa27749879a119b1658718ee435e3e1cc865e5b SHA1 c143e9ed22ad2bb0a153ae8498dcd5c136aa9857 SHA256 c2f6d0df983abd934db52d9672b601d7fdc42ebe12c647624b0009f100a78496
 DIST patch-ovz028stab053.4-combined.gz 1142095 RMD160 d4ac3f1d6c6db92bae89859c96e94df24a9e37ca SHA1 7e0a8c3caf808cec70d8676770cc32859ef4f4df SHA256 3d7901582c35b70c9581e2cd1d3e1a3ddae79b607c7de927cd99edc878e73f27
+EBUILD openvz-sources-2.6.18.028.053-r1.ebuild 1175 RMD160 31f04d0f2a9755eb00883e57e92c6d060040fdd7 SHA1 6299dcfab0ce76068fac04b52627ada56f4e9f05 SHA256 4609bd1b0304d77e1fac6ec403f23117fba2eeb9d1162c1738475c89f07396d6
 EBUILD openvz-sources-2.6.18.028.053.ebuild 1115 RMD160 09a84d08e1c61faf4dc891ce692831ffe8b6ed51 SHA1 6df24bba22f770de2675badbb1a3b66452806329 SHA256 b2972144dda305cde861968d24a9957c7b5f62b3dc2d3a36e62fe4ac9270410d
 EBUILD openvz-sources-2.6.22.005.ebuild 1047 RMD160 1bcd8d93059eb84de7bb5b402d4773f1d55db49a SHA1 7f7d36d54618fdaf4512bda9d3aaf15e935452f0 SHA256 8e04ef2a3e6f5c55abc5e2079bbb877bcb8cf9db209723cd114fe11bc1890b28
-MISC ChangeLog 18602 RMD160 da93d81b9fb575e086236faa81a08649de852d6d SHA1 fdeacd3db04dc7e2773fc6a7a1c833fa7f67e869 SHA256 26e49cf3c3b67235e75c0730050b45dcb71c2e7398a3d10742066ed75269015d
+MISC ChangeLog 18839 RMD160 ea3f6e9799219931f5293a657ceee5cc62939982 SHA1 42f650d39b0c43704b0b152f756b949dd6ca8005 SHA256 1dec47321e6f162b552d27dde19ebd66dfe2512f790813664c23bc5b349448b6
 MISC metadata.xml 624 RMD160 7ad21d7bb5c38289c9a3d920c724aba031e8be57 SHA1 af0533432c352cfb2227b1073b95bbffad22b174 SHA256 726f26b7cb019e4e106eb1f222e8e5c0adc3624137f5678f18f2ed0026ed1674
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.18-ms-splice-access.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.18-ms-splice-access.patch
new file mode 100644
index 000000000000..d323f0cc28cf
--- /dev/null
+++ b/sys-kernel/openvz-sources/files/openvz-sources-2.6.18-ms-splice-access.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/show_bug.cgi?id=209460
+http://bugzilla.openvz.org/show_bug.cgi?id=814
+
+--- ./fs/splice.c.pipe	2008-01-28 18:56:37.000000000 +0300
++++ ./fs/splice.c	2008-02-11 14:00:53.000000000 +0300
+@@ -1138,6 +1138,10 @@ static int get_iovec_page_array(const st
+ 		/*
+ 		 * Get user address base and length for this iovec.
+ 		 */
++		error = -EFAULT;
++        	if (!access_ok(VERIFY_READ, iov, sizeof(*iov)))
++			break;
++
+ 		error = get_user(base, &iov->iov_base);
+ 		if (unlikely(error))
+ 			break;
+@@ -1151,7 +1155,7 @@ static int get_iovec_page_array(const st
+ 		if (unlikely(!len))
+ 			break;
+ 		error = -EFAULT;
+-		if (unlikely(!base))
++		if (!access_ok(VERIFY_READ, base, len))
+ 			break;
+ 
+ 		/*
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.053-r1.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.053-r1.ebuild
new file mode 100644
index 000000000000..c440159a02f9
--- /dev/null
+++ b/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.053-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.053-r1.ebuild,v 1.1 2008/02/13 08:41:15 pva Exp $
+
+inherit versionator
+
+ETYPE="sources"
+
+CKV=$(get_version_component_range 1-3)
+OKV=${OKV:-${CKV}}
+KV_FULL=${CKV}-${PN/-*}-$(get_version_component_range 4).$(get_version_component_range 5)
+OVZ_KERNEL="$(get_version_component_range 4)stab$(get_version_component_range 5)"
+OVZ_REV="4"
+EXTRAVERSION=-${OVZ_KERNEL}
+KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2"
+
+inherit kernel-2
+detect_version
+
+KEYWORDS="amd64 ~ia64 ~ppc64 ~sparc x86"
+IUSE=""
+
+DESCRIPTION="Full sources including OpenVZ patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+HOMEPAGE="http://www.openvz.org"
+SRC_URI="${KERNEL_URI} ${ARCH_URI}
+	http://download.openvz.org/kernel/branches/${CKV}/${OVZ_KERNEL}.${OVZ_REV}/patches/patch-ovz${OVZ_KERNEL}.${OVZ_REV}-combined.gz"
+
+UNIPATCH_STRICTORDER=1
+UNIPATCH_LIST="${DISTDIR}/patch-ovz${OVZ_KERNEL}.${OVZ_REV}-combined.gz
+${FILESDIR}/openvz-sources-2.6.18-ms-splice-access.patch"