From 1a5edc64991e66cf06118faf56ab4d54cc42f2a8 Mon Sep 17 00:00:00 2001
From: Xiaotian Feng <dfeng@redhat.com>
Date: Mon, 29 Nov 2010 10:03:55 +0100
Subject: [PATCH] --- yaml --- r: 223454 b: refs/heads/master c:
 5478755616ae2ef1ce144dded589b62b2a50d575 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/block/blk-map.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 75a82a75bd21..30a9ecaf0043 100644
--- 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
index 5d5dbe47c228..e663ac2d8e68 100644
--- 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)