[kernel] r18262 - in dists/trunk/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Sun Nov 13 19:00:34 2011
New Revision: 18262

Log:
block: Always check length of all iov entries in blk_rq_map_user_iov()

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/all/block-Always-check-length-of-all-iov-entries-in-blk_.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/base

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sun Nov 13 17:17:31 2011	(r18261)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Nov 13 19:00:34 2011	(r18262)
@@ -21,6 +21,7 @@
   * hfs: fix hfs_find_init() sb->ext_tree NULL ptr oops (CVE-2011-2203)
   * vmscan: fix shrinker callback bug in fs/super.c
   * [ia64] Add accept4() syscall, thanks to Émeric Maschino (Closes: #647825)
+  * block: Always check length of all iov entries in blk_rq_map_user_iov()
 
  -- Ben Hutchings <ben at decadent.org.uk>  Fri, 04 Nov 2011 15:05:47 +0000
 

Added: dists/trunk/linux-2.6/debian/patches/bugfix/all/block-Always-check-length-of-all-iov-entries-in-blk_.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/block-Always-check-length-of-all-iov-entries-in-blk_.patch	Sun Nov 13 19:00:34 2011	(r18262)
@@ -0,0 +1,34 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Sun, 13 Nov 2011 18:42:46 +0000
+Subject: [PATCH] block: Always check length of all iov entries in
+ blk_rq_map_user_iov()
+
+Even after commit 5478755616ae2ef1ce144dded589b62b2a50d575
+("block: check for proper length of iov entries earlier ...")
+we still won't check for zero-length entries after an unaligned
+entry.  Remove the break-statement, so all entries are checked.
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ block/blk-map.c |    4 +---
+ 1 files changed, 1 insertions(+), 3 deletions(-)
+
+diff --git a/block/blk-map.c b/block/blk-map.c
+index e663ac2..2e852a4 100644
+--- a/block/blk-map.c
++++ b/block/blk-map.c
+@@ -204,10 +204,8 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,
+ 		if (!iov[i].iov_len)
+ 			return -EINVAL;
+ 
+-		if (uaddr & queue_dma_alignment(q)) {
++		if (uaddr & queue_dma_alignment(q))
+ 			unaligned = 1;
+-			break;
+-		}
+ 	}
+ 
+ 	if (unaligned || (q->dma_pad_mask & len) || map_data)
+-- 
+1.7.7.2
+

Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base	Sun Nov 13 17:17:31 2011	(r18261)
+++ dists/trunk/linux-2.6/debian/patches/series/base	Sun Nov 13 19:00:34 2011	(r18262)
@@ -58,3 +58,4 @@
 + bugfix/all/hfs-fix-hfs_find_init-sb-ext_tree-NULL-ptr-oops.patch
 + bugfix/all/vmscan-fix-shrinker-callback-bug-in-fs-super.c.patch
 + bugfix/ia64/ia64-Add-accept4-syscall.patch
++ bugfix/all/block-Always-check-length-of-all-iov-entries-in-blk_.patch