[26/26] block: Always check length of all iov entries in blk_rq_map_user_iov()

Greg KH
2011-11-19T00:09:30Z

From: Ben Hutchings <ben@decadent.org.uk>

commit 6b76106d8ef31111d6fc469564b83b5f5542794f upstream.

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@decadent.org.uk>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
block/blk-map.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -204,10 +204,11 @@ int blk_rq_map_user_iov(struct request_q
if (!iov[i].iov_len)
return -EINVAL;

- if (uaddr & queue_dma_alignment(q)) {
+ /*
+ * Keep going so we check length of all segments
+ */
+ if (uaddr & queue_dma_alignment(q))
unaligned = 1;
- break;
- }
}

if (unaligned || (q->dma_pad_mask & len) || map_data)