[gentoo-commits] linux-patches r1258 - genpatches-2.6/trunk/2.6.24

[gentoo-commits] linux-patches r1258 - genpatches-2.6/trunk/2.6.24

[Daniel Drake (dsd)]

Author: dsd
Date: 2008-02-26 14:22:03 +0000 (Tue, 26 Feb 2008)
New Revision: 1258

Added:
   genpatches-2.6/trunk/2.6.24/1001_linux-2.6.24.2.patch
Removed:
   genpatches-2.6/trunk/2.6.24/1400_vmsplice-user-pointer.patch
Modified:
   genpatches-2.6/trunk/2.6.24/0000_README
Log:
Linux 2.6.24.2

Modified: genpatches-2.6/trunk/2.6.24/0000_README
===================================================================
--- genpatches-2.6/trunk/2.6.24/0000_README	2008-02-26 14:14:21 UTC (rev 1257)
+++ genpatches-2.6/trunk/2.6.24/0000_README	2008-02-26 14:22:03 UTC (rev 1258)
@@ -43,6 +43,14 @@
 From:	http://www.kernel.org
 Desc:	Linux 2.6.24.1
 
+Patch:	1001_linux-2.6.24.2.patch
+From:	http://www.kernel.org
+Desc:	Linux 2.6.24.2
+
+Patch:	1500_get-zero-user-pages.patch
+From:	http://bugs.gentoo.org/209460
+Desc:	Preventative measure against future vmsplice-like security issues
+
 Patch:	1700_moduleparam.patch
 From:	http://bugs.gentoo.org/187175
 Desc:	Fix GCC 4.2 compile failure on alpha/ia64/ppc64
@@ -67,6 +75,10 @@
 From:	http://bugs.gentoo.org/196879
 Desc:	Fix TEST_UNIT_READY for medium detection
 
+Patch:	2300_pci-use-conf1.patch
+From:	http://bugs.gentoo.org/198810
+Desc:	Fix boot hang on Intel Q35 chipset
+
 Patch:	2400_e1000e-crc-stripping.patch
 From:	http://bugs.gentoo.org/209235
 Desc:	Fix e1000e bridging issue
@@ -75,18 +87,6 @@
 From:	http://bugs.gentoo.org/207706
 Desc:	Fix reading of MAC address in sis190 driver
 
-Patch:	1400_vmsplice-user-pointer.patch
-From:	http://bugs.gentoo.org/209460
-Desc:	Fix another vmsplice() security issue
-
-Patch:	1500_get-zero-user-pages.patch
-From:	http://bugs.gentoo.org/209460
-Desc:	Preventative measure against future vmsplice-like security issues
-
-Patch:	2300_pci-use-conf1.patch
-From:	http://bugs.gentoo.org/198810
-Desc:	Fix boot hang on Intel Q35 chipset
-
 Patch:	2500_arcmsr-dma-coherent-warnings.patch
 From:	http://bugs.gentoo.org/208493
 Desc:	Fix warning flood when arcmsr is ran with archttp

Added: genpatches-2.6/trunk/2.6.24/1001_linux-2.6.24.2.patch
===================================================================
--- genpatches-2.6/trunk/2.6.24/1001_linux-2.6.24.2.patch	                        (rev 0)
+++ genpatches-2.6/trunk/2.6.24/1001_linux-2.6.24.2.patch	2008-02-26 14:22:03 UTC (rev 1258)
@@ -0,0 +1,13 @@
+diff --git a/fs/splice.c b/fs/splice.c
+index 36fdc61..e313478 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -1239,7 +1239,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
+ 		if (unlikely(!len))
+ 			break;
+ 		error = -EFAULT;
+-		if (unlikely(!base))
++		if (!access_ok(VERIFY_READ, base, len))
+ 			break;
+ 
+ 		/*

Deleted: genpatches-2.6/trunk/2.6.24/1400_vmsplice-user-pointer.patch
===================================================================
--- genpatches-2.6/trunk/2.6.24/1400_vmsplice-user-pointer.patch	2008-02-26 14:14:21 UTC (rev 1257)
+++ genpatches-2.6/trunk/2.6.24/1400_vmsplice-user-pointer.patch	2008-02-26 14:22:03 UTC (rev 1258)
@@ -1,36 +0,0 @@
-From: Bastian Blank <bastian@waldi.eu.org>
-Date: Sun, 10 Feb 2008 14:47:57 +0000 (+0200)
-Subject: splice: fix user pointer access in get_iovec_page_array()
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=712a30e63c8066ed84385b12edbfb804f49cbc44
-
-splice: fix user pointer access in get_iovec_page_array()
-
-Commit 8811930dc74a503415b35c4a79d14fb0b408a361 ("splice: missing user
-pointer access verification") added the proper access_ok() calls to
-copy_from_user_mmap_sem() which ensures we can copy the struct iovecs
-from userspace to the kernel.
-
-But we also must check whether we can access the actual memory region
-pointed to by the struct iovec to fix the access checks properly.
-
-Signed-off-by: Bastian Blank <waldi@debian.org>
-Acked-by: Oliver Pinter <oliver.pntr@gmail.com>
-Cc: Jens Axboe <jens.axboe@oracle.com>
-Cc: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
-
-diff --git a/fs/splice.c b/fs/splice.c
-index 14e2262..9b559ee 100644
---- a/fs/splice.c
-+++ b/fs/splice.c
-@@ -1234,7 +1234,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
- 		if (unlikely(!len))
- 			break;
- 		error = -EFAULT;
--		if (unlikely(!base))
-+		if (!access_ok(VERIFY_READ, base, len))
- 			break;
- 
- 		/*

-- 
gentoo-commits@lists.gentoo.org mailing list