Added a patch to add in missing I2C sanity checks that were added upstream in 2.4.21.

7 files changed, 67 insertions, 12 deletions

diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog
index 77d45ad304cc..41392486af13 100644
--- a/sys-kernel/gentoo-sources/ChangeLog
+++ b/sys-kernel/gentoo-sources/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-kernel/gentoo-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.71 2004/06/14 20:37:48 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.72 2004/06/19 13:00:48 plasmaroo Exp $
+
+*gentoo-sources-2.4.20-r19 (19 Jun 2004)
+
+  19 Jun 2004; <plasmaroo@gentoo.org> -gentoo-sources-2.4.19-r15.ebuild,
+  +gentoo-sources-2.4.19-r16.ebuild, -gentoo-sources-2.4.20-r18.ebuild,
+  +gentoo-sources-2.4.20-r19.ebuild,
+  +files/gentoo-sources-2.4.I2C_Limits.patch:
+  Added a patch to add in missing I2C sanity checks that were added upstream in
+  2.4.21.
 
 *gentoo-sources-2.4.20-r18 (14 Jun 2004)
 
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index a732d56782a5..3d7756ad30ad 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,22 +1,23 @@
-MD5 29580d2529520ef997ad23cbbc3a732b ChangeLog 17968
+MD5 b86df79e3088758647c125c0e4657667 ChangeLog 18329
 MD5 65b42badf8c90030f78850a376d3bd23 gentoo-sources-2.4.26-r2.ebuild 626
-MD5 a353950e4843fbfd887502315504a7d8 gentoo-sources-2.4.19-r15.ebuild 3551
+MD5 979f9602e42d2755193cbc35e3d5f030 gentoo-sources-2.4.19-r16.ebuild 3551
 MD5 3ae5a3a4d63d6d43c6f45da091d792d1 gentoo-sources-2.4.25-r4.ebuild 883
 MD5 c39e44cdffc658550831af5b93b392d5 metadata.xml 289
 MD5 a18795e1f17cc8819279fee18f10b8d3 gentoo-sources-2.4.22-r11.ebuild 1489
-MD5 13f317eebf0fce146113a5b848600482 gentoo-sources-2.4.20-r18.ebuild 6284
+MD5 fe11180c08c2559fd8caf96e147dd18f gentoo-sources-2.4.20-r19.ebuild 6394
 MD5 6450fd1b19f30aa33866e5e467c0d828 files/gentoo-sources-2.4.20-cs46xx-gcc33.patch 374
 MD5 c460ea130cb4ae84a5063ba044e3ce72 files/gentoo-sources-2.4.CAN-2004-0427.patch 460
 MD5 b40c150e8529876064e1ec409a47984e files/security.patch4 783
+MD5 34487f5dc39d4ce8178004ced591fa83 files/digest-gentoo-sources-2.4.20-r19 146
 MD5 2f4db0083c0ed762c0af63f26812a68b files/gentoo-sources-2.4.20-fix-proc-mm.patch 1300
 MD5 e77a93fdf26f06cf3ea5080b27211725 files/gentoo-sources-2.4.CAN-2003-0985.patch 414
 MD5 9601c35f96d297ed0d13753875fb3068 files/gentoo-sources-2.4.20-gcc33.patch 13455
 MD5 174438d215b70cad5ffb00ca8123c062 files/gentoo-sources-2.4.munmap.patch 837
+MD5 8c31359a134b927f7038539e7dd896d4 files/digest-gentoo-sources-2.4.19-r16 146
 MD5 032ff70c5895cc1a2dfbe2a58ebde1f7 files/gentoo-sources-2.4.19-munmap.patch 819
 MD5 df40eece807d039cba79f477e80ebda2 files/gentoo-sources-2.4.19-rtc_fix.patch 4974
 MD5 ac42024b6e6ee1e2165914db4b22a61c files/gentoo-sources-2.4.CAN-2004-0178.patch 424
 MD5 21ebf0ddc4b8ec4013470c4d243cd03b files/gentoo-sources-2.4.20-munmap.patch 826
-MD5 34487f5dc39d4ce8178004ced591fa83 files/digest-gentoo-sources-2.4.20-r18 146
 MD5 7b306c2be9db38aeb8e0dbfea6dea17a files/gentoo-sources-2.4.20-hpt372.patch 31675
 MD5 d4a740ae56c2049247083af387a22a85 files/gentoo-sources-2.4.CAN-2004-0394.patch 350
 MD5 fc288f24a93773f560020bd65344ae93 files/digest-gentoo-sources-2.4.26-r2 145
@@ -30,13 +31,13 @@ MD5 39af009b63a2f2042ac251fa801044d9 files/gentoo-sources-2.4.19-CAN-2004-0181.p
 MD5 a61e57d5483a06f20da339d91f98fbb8 files/gentoo-sources-2.4.20-rtc_fix.patch 6769
 MD5 147fec50180ad91b6260fc7201dcb90f files/gentoo-sources-2.4.CAN-2004-0010.patch 6050
 MD5 6bd1b3d66aca4f2ae0cfd964caa28cc9 files/gentoo-sources-2.4.20-devfs-snd-fix.patch 1973
-MD5 8c31359a134b927f7038539e7dd896d4 files/digest-gentoo-sources-2.4.19-r15 146
 MD5 0f54abe62bc4311334eb74604dc39e52 files/digest-gentoo-sources-2.4.25-r4 144
 MD5 5bf9836a632a861728d33f9736bb7431 files/gentoo-sources-2.4.CAN-2004-0133.patch 427
 MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/gentoo-sources-2.4.22-rtc_fix.patch 7073
 MD5 3bf2f78421fe7eb5babc154d4ad4dbbd files/security.patch1 14328
 MD5 857ff623313f874e811763a2db96e831 files/lcall-DoS.patch 885
 MD5 012e8ba5d18dbb8d508ac4955e143e3a files/gentoo-sources-2.4.20-ipt-route.patch 13307
+MD5 e30386f1121b1197396ed9082eae7dcb files/gentoo-sources-2.4.I2C_Limits.patch 1037
 MD5 c9da1bc82b906f6abc648c056e7bf662 files/gentoo-sources-2.4.FPULockup-53804.patch 354
 MD5 cbd2a33f15a8d2e7ab700a0b45fac377 files/gentoo-sources-2.4.20-grsec-disabled.patch 562
 MD5 2ac4fd77e067652901ccf234c9687bb1 files/i810_drm.patch 1247
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r15 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r16
index 19d991259834..19d991259834 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r15
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r16
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r18 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r19
index 0d9abd01d13b..0d9abd01d13b 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r18
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r19
diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.I2C_Limits.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.I2C_Limits.patch
new file mode 100644
index 000000000000..af20a6fc0c2c
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.I2C_Limits.patch
@@ -0,0 +1,44 @@
+--- linux-2.4.20/drivers/i2c/i2c-dev.c	2004-06-19 03:27:30 -07:00
++++ linux-2.4.21/drivers/i2c/i2c-dev.c	2004-06-19 03:27:30 -07:00
+@@ -254,6 +254,11 @@
+ 				   sizeof(rdwr_arg)))
+ 			return -EFAULT;
+ 
++		/* Put an arbritrary limit on the number of messages that can
++		 * be sent at once */
++		if (rdwr_arg.nmsgs > 42)
++			return -EINVAL;
++		
+ 		rdwr_pa = (struct i2c_msg *)
+ 			kmalloc(rdwr_arg.nmsgs * sizeof(struct i2c_msg), 
+ 			GFP_KERNEL);
+@@ -270,6 +275,11 @@
+ 			        res = -EFAULT;
+ 				break;
+ 			}
++			/* Limit the size of the message to a sane amount */
++			if (rdwr_pa[i].len > 8192) {
++				res = -EINVAL;
++				break;
++			}
+ 			rdwr_pa[i].buf = kmalloc(rdwr_pa[i].len, GFP_KERNEL);
+ 			if(rdwr_pa[i].buf == NULL)
+ 			{
+@@ -280,10 +290,16 @@
+ 				rdwr_arg.msgs[i].buf,
+ 				rdwr_pa[i].len))
+ 			{
+-			    	kfree(rdwr_pa[i].buf);
+ 			    	res = -EFAULT;
+ 				break;
+ 			}
++		}
++		if (res < 0) {
++			int j;
++			for (j = 0; j < i; ++j)
++				kfree(rdwr_pa[j].buf);
++			kfree(rdwr_pa);
++			return res;
+ 		}
+ 		if (!res) 
+ 		{
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r15.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r16.ebuild
index 693ca7b8c937..9dd4fbbb3d38 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r15.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r15.ebuild,v 1.1 2004/06/14 20:37:48 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r16.ebuild,v 1.1 2004/06/19 13:00:48 plasmaroo Exp $
 
 IUSE="build crypt xfs acpi4linux"
 
@@ -35,7 +35,7 @@ S=${WORKDIR}/linux-${KV}
 
 DESCRIPTION="Full sources for the Gentoo Linux kernel"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 http://gentoo.lostlogicx.com/patches-${KV/15/10}.tar.bz2"
+	 http://gentoo.lostlogicx.com/patches-${KV/16/10}.tar.bz2"
 KEYWORDS="x86 -ppc -sparc -amd64 -ia64"
 SLOT="${KV}"
 
@@ -43,7 +43,7 @@ src_unpack() {
 	unpack ${A}
 	mv linux-${OKV} linux-${KV} || die
 
-	cd ${KV/15/10}
+	cd ${KV/16/10}
 	# Kill patches we aren't suppposed to use, don't worry about 
 	# failures, if they aren't there that is a good thing!
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r18.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r19.ebuild
index 5195d6d1af03..29671893eb3e 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r18.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r18.ebuild,v 1.1 2004/06/14 20:37:48 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r19.ebuild,v 1.1 2004/06/19 13:00:48 plasmaroo Exp $
 
 IUSE="build crypt evms2 aavm usagi"
 
@@ -30,7 +30,7 @@ S=${WORKDIR}/linux-${KV}
 
 DESCRIPTION="Full sources for the Gentoo Kernel."
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/patches-${KV/18/14}.tar.bz2"
+	 http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/patches-${KV/19/14}.tar.bz2"
 HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
 LICENSE="GPL-2"
 KEYWORDS="x86 -ppc -sparc -alpha -hppa -mips"
@@ -40,7 +40,7 @@ src_unpack() {
 	unpack ${A}
 	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
 
-	cd ${WORKDIR}/${KV/18/14}
+	cd ${WORKDIR}/${KV/19/14}
 
 	# This is the *ratified* aavm USE flag, enables aavm support in this kernel
 	if [ -z "`use aavm`" ]; then
@@ -135,6 +135,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0181.patch || die "Failed to add the CAN-2004-0181 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0427.patch || die "Failed to add the CAN-2004-0427 patch!"
+	epatch ${FILESDIR}/${PN}-2.4.I2C_Limits.patch || die "Failed to patch the I2C i2cdev_ioctl() kmalloc() bug!"
 	epatch ${FILESDIR}/${PN}-2.4.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
 }