| 1 |
Author: dsd |
| 2 |
Date: 2008-02-26 14:22:03 +0000 (Tue, 26 Feb 2008) |
| 3 |
New Revision: 1258 |
| 4 |
|
| 5 |
Added: |
| 6 |
genpatches-2.6/trunk/2.6.24/1001_linux-2.6.24.2.patch |
| 7 |
Removed: |
| 8 |
genpatches-2.6/trunk/2.6.24/1400_vmsplice-user-pointer.patch |
| 9 |
Modified: |
| 10 |
genpatches-2.6/trunk/2.6.24/0000_README |
| 11 |
Log: |
| 12 |
Linux 2.6.24.2 |
| 13 |
|
| 14 |
Modified: genpatches-2.6/trunk/2.6.24/0000_README |
| 15 |
=================================================================== |
| 16 |
--- genpatches-2.6/trunk/2.6.24/0000_README 2008-02-26 14:14:21 UTC (rev 1257) |
| 17 |
+++ genpatches-2.6/trunk/2.6.24/0000_README 2008-02-26 14:22:03 UTC (rev 1258) |
| 18 |
@@ -43,6 +43,14 @@ |
| 19 |
From: http://www.kernel.org |
| 20 |
Desc: Linux 2.6.24.1 |
| 21 |
|
| 22 |
+Patch: 1001_linux-2.6.24.2.patch |
| 23 |
+From: http://www.kernel.org |
| 24 |
+Desc: Linux 2.6.24.2 |
| 25 |
+ |
| 26 |
+Patch: 1500_get-zero-user-pages.patch |
| 27 |
+From: http://bugs.gentoo.org/209460 |
| 28 |
+Desc: Preventative measure against future vmsplice-like security issues |
| 29 |
+ |
| 30 |
Patch: 1700_moduleparam.patch |
| 31 |
From: http://bugs.gentoo.org/187175 |
| 32 |
Desc: Fix GCC 4.2 compile failure on alpha/ia64/ppc64 |
| 33 |
@@ -67,6 +75,10 @@ |
| 34 |
From: http://bugs.gentoo.org/196879 |
| 35 |
Desc: Fix TEST_UNIT_READY for medium detection |
| 36 |
|
| 37 |
+Patch: 2300_pci-use-conf1.patch |
| 38 |
+From: http://bugs.gentoo.org/198810 |
| 39 |
+Desc: Fix boot hang on Intel Q35 chipset |
| 40 |
+ |
| 41 |
Patch: 2400_e1000e-crc-stripping.patch |
| 42 |
From: http://bugs.gentoo.org/209235 |
| 43 |
Desc: Fix e1000e bridging issue |
| 44 |
@@ -75,18 +87,6 @@ |
| 45 |
From: http://bugs.gentoo.org/207706 |
| 46 |
Desc: Fix reading of MAC address in sis190 driver |
| 47 |
|
| 48 |
-Patch: 1400_vmsplice-user-pointer.patch |
| 49 |
-From: http://bugs.gentoo.org/209460 |
| 50 |
-Desc: Fix another vmsplice() security issue |
| 51 |
- |
| 52 |
-Patch: 1500_get-zero-user-pages.patch |
| 53 |
-From: http://bugs.gentoo.org/209460 |
| 54 |
-Desc: Preventative measure against future vmsplice-like security issues |
| 55 |
- |
| 56 |
-Patch: 2300_pci-use-conf1.patch |
| 57 |
-From: http://bugs.gentoo.org/198810 |
| 58 |
-Desc: Fix boot hang on Intel Q35 chipset |
| 59 |
- |
| 60 |
Patch: 2500_arcmsr-dma-coherent-warnings.patch |
| 61 |
From: http://bugs.gentoo.org/208493 |
| 62 |
Desc: Fix warning flood when arcmsr is ran with archttp |
| 63 |
|
| 64 |
Added: genpatches-2.6/trunk/2.6.24/1001_linux-2.6.24.2.patch |
| 65 |
=================================================================== |
| 66 |
--- genpatches-2.6/trunk/2.6.24/1001_linux-2.6.24.2.patch (rev 0) |
| 67 |
+++ genpatches-2.6/trunk/2.6.24/1001_linux-2.6.24.2.patch 2008-02-26 14:22:03 UTC (rev 1258) |
| 68 |
@@ -0,0 +1,13 @@ |
| 69 |
+diff --git a/fs/splice.c b/fs/splice.c |
| 70 |
+index 36fdc61..e313478 100644 |
| 71 |
+--- a/fs/splice.c |
| 72 |
++++ b/fs/splice.c |
| 73 |
+@@ -1239,7 +1239,7 @@ static int get_iovec_page_array(const struct iovec __user *iov, |
| 74 |
+ if (unlikely(!len)) |
| 75 |
+ break; |
| 76 |
+ error = -EFAULT; |
| 77 |
+- if (unlikely(!base)) |
| 78 |
++ if (!access_ok(VERIFY_READ, base, len)) |
| 79 |
+ break; |
| 80 |
+ |
| 81 |
+ /* |
| 82 |
|
| 83 |
Deleted: genpatches-2.6/trunk/2.6.24/1400_vmsplice-user-pointer.patch |
| 84 |
=================================================================== |
| 85 |
--- genpatches-2.6/trunk/2.6.24/1400_vmsplice-user-pointer.patch 2008-02-26 14:14:21 UTC (rev 1257) |
| 86 |
+++ genpatches-2.6/trunk/2.6.24/1400_vmsplice-user-pointer.patch 2008-02-26 14:22:03 UTC (rev 1258) |
| 87 |
@@ -1,36 +0,0 @@ |
| 88 |
-From: Bastian Blank <bastian@××××××××.org> |
| 89 |
-Date: Sun, 10 Feb 2008 14:47:57 +0000 (+0200) |
| 90 |
-Subject: splice: fix user pointer access in get_iovec_page_array() |
| 91 |
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=712a30e63c8066ed84385b12edbfb804f49cbc44 |
| 92 |
- |
| 93 |
-splice: fix user pointer access in get_iovec_page_array() |
| 94 |
- |
| 95 |
-Commit 8811930dc74a503415b35c4a79d14fb0b408a361 ("splice: missing user |
| 96 |
-pointer access verification") added the proper access_ok() calls to |
| 97 |
-copy_from_user_mmap_sem() which ensures we can copy the struct iovecs |
| 98 |
-from userspace to the kernel. |
| 99 |
- |
| 100 |
-But we also must check whether we can access the actual memory region |
| 101 |
-pointed to by the struct iovec to fix the access checks properly. |
| 102 |
- |
| 103 |
-Signed-off-by: Bastian Blank <waldi@××××××.org> |
| 104 |
-Acked-by: Oliver Pinter <oliver.pntr@×××××.com> |
| 105 |
-Cc: Jens Axboe <jens.axboe@××××××.com> |
| 106 |
-Cc: Andrew Morton <akpm@××××××××××××××××.org> |
| 107 |
-Signed-off-by: Pekka Enberg <penberg@×××××××××××.fi> |
| 108 |
-Signed-off-by: Linus Torvalds <torvalds@××××××××××××××××.org> |
| 109 |
---- |
| 110 |
- |
| 111 |
-diff --git a/fs/splice.c b/fs/splice.c |
| 112 |
-index 14e2262..9b559ee 100644 |
| 113 |
---- a/fs/splice.c |
| 114 |
-+++ b/fs/splice.c |
| 115 |
-@@ -1234,7 +1234,7 @@ static int get_iovec_page_array(const struct iovec __user *iov, |
| 116 |
- if (unlikely(!len)) |
| 117 |
- break; |
| 118 |
- error = -EFAULT; |
| 119 |
-- if (unlikely(!base)) |
| 120 |
-+ if (!access_ok(VERIFY_READ, base, len)) |
| 121 |
- break; |
| 122 |
- |
| 123 |
- /* |
| 124 |
|
| 125 |
-- |
| 126 |
gentoo-commits@l.g.o mailing list |
Archives