---

yaml --- r: 223454 b: refs/heads/master c: 5478755 h: refs/heads/master v: v3
git-mirror · Nov 29, 2010 · 1a5edc6 · 1a5edc6
1 parent 275f3f5
commit 1a5edc6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a115413de13ae6beb0cbfc198afe385a261ab284
+refs/heads/master: 5478755616ae2ef1ce144dded589b62b2a50d575
diff --git a/trunk/block/blk-map.c b/trunk/block/blk-map.c
@@ -201,12 +201,13 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,
 	for (i = 0; i < iov_count; i++) {
 		unsigned long uaddr = (unsigned long)iov[i].iov_base;
 
+		if (!iov[i].iov_len)
+			return -EINVAL;
+
 		if (uaddr & queue_dma_alignment(q)) {
 			unaligned = 1;
 			break;
 		}
-		if (!iov[i].iov_len)
-			return -EINVAL;
 	}
 
 	if (unaligned || (q->dma_pad_mask & len) || map_data)