Author: arekm Date: Sun Feb 10 21:06:06 2008 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- fix
---- Files affected:
SOURCES:
kernel-vmsplice.patch (1.1.4.2 -> 1.1.4.3)
---- Diffs:
================================================================
Index: SOURCES/kernel-vmsplice.patch
diff -u SOURCES/kernel-vmsplice.patch:1.1.4.2
SOURCES/kernel-vmsplice.patch:1.1.4.3
--- SOURCES/kernel-vmsplice.patch:1.1.4.2 Sun Feb 10 21:55:41 2008
+++ SOURCES/kernel-vmsplice.patch Sun Feb 10 22:06:00 2008
@@ -1,45 +1,3 @@
-commit 8811930dc74a503415b35c4a79d14fb0b408a361
-Author: Jens Axboe <[EMAIL PROTECTED]>
-Date: Fri Feb 8 08:49:14 2008 -0800
-
- splice: missing user pointer access verification
-
- vmsplice_to_user() must always check the user pointer and length
- with access_ok() before copying. Likewise, for the slow path of
- copy_from_user_mmap_sem() we need to check that we may read from
- the user region.
-
- Signed-off-by: Jens Axboe <[EMAIL PROTECTED]>
- Cc: Wojciech Purczynski <[EMAIL PROTECTED]>
- Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
- Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
-
-diff --git a/fs/splice.c b/fs/splice.c
-index 4ee49e8..14e2262 100644
---- a/fs/splice.c
-+++ b/fs/splice.c
-@@ -1179,6 +1179,9 @@ static int copy_from_user_mmap_sem(void *dst, const void
__user *src, size_t n)
- {
- int partial;
-
-+ if (!access_ok(VERIFY_READ, src, n))
-+ return -EFAULT;
-+
- pagefault_disable();
- partial = __copy_from_user_inatomic(dst, src, n);
- pagefault_enable();
-@@ -1387,6 +1390,11 @@ static long vmsplice_to_user(struct file *file, const
struct iovec __user *iov,
- break;
- }
-
-+ if (unlikely(!access_ok(VERIFY_WRITE, base, len))) {
-+ error = -EFAULT;
-+ break;
-+ }
-+
- sd.len = 0;
- sd.total_len = len;
- sd.flags = flags;
commit 712a30e63c8066ed84385b12edbfb804f49cbc44
Author: Bastian Blank <[EMAIL PROTECTED]>
Date: Sun Feb 10 16:47:57 2008 +0200
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-vmsplice.patch?r1=1.1.4.2&r2=1.1.4.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
