Author: hawk                         Date: Sun Feb 10 22:49:01 2008 GMT
Module: SOURCES                       Tag: Titanium
---- Log message:
- fix for local root hole

---- Files affected:
SOURCES:
   kernel-vanilla-vmsplice.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/kernel-vanilla-vmsplice.patch
diff -u /dev/null SOURCES/kernel-vanilla-vmsplice.patch:1.1.2.1
--- /dev/null   Sun Feb 10 23:49:01 2008
+++ SOURCES/kernel-vanilla-vmsplice.patch       Sun Feb 10 23:48:56 2008
@@ -0,0 +1,34 @@
+commit 712a30e63c8066ed84385b12edbfb804f49cbc44
+Author: Bastian Blank <[EMAIL PROTECTED]>
+Date:   Sun Feb 10 16:47:57 2008 +0200
+
+    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 <[EMAIL PROTECTED]>
+    Acked-by: Oliver Pinter <[EMAIL PROTECTED]>
+    Cc: Jens Axboe <[EMAIL PROTECTED]>
+    Cc: Andrew Morton <[EMAIL PROTECTED]>
+    Signed-off-by: Pekka Enberg <[EMAIL PROTECTED]>
+    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
+
+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;
+ 
+               /*
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to