X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=block%2Fblk-map.c;h=e663ac2d8e68f70ff17ce274f3cebec16c1dd18c;hb=b08b27213384d1bd6eda04a2b6f788b4cdee0f34;hp=5d5dbe47c2285ee7ccb5f3ca784f9cdb8cb6df3e;hpb=b5c551043617ecf84ad6bb888f96fdf4e4769d4c;p=firefly-linux-kernel-4.4.55.git

diff --git a/block/blk-map.c b/block/blk-map.c
index 5d5dbe47c228..e663ac2d8e68 100644
--- a/block/blk-map.c
+++ b/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)