aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings2011-11-13 12:58:09 -0600
committerJens Axboe2011-11-13 12:58:09 -0600
commit6b76106d8ef31111d6fc469564b83b5f5542794f (patch)
tree3df7d414b200aa07f083f70a1c4f5c8da7a11043 /block/blk-map.c
parent193733585692301f38d489b8ad8724c2f88349c0 (diff)
downloadkernel-common-6b76106d8ef31111d6fc469564b83b5f5542794f.tar.gz
kernel-common-6b76106d8ef31111d6fc469564b83b5f5542794f.tar.xz
kernel-common-6b76106d8ef31111d6fc469564b83b5f5542794f.zip
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@decadent.org.uk> Cc: stable@vger.kernel.org Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-map.c')
-rw-r--r--block/blk-map.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/block/blk-map.c b/block/blk-map.c
index e663ac2d8e6..164cd005970 100644
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -204,10 +204,11 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,
204 if (!iov[i].iov_len) 204 if (!iov[i].iov_len)
205 return -EINVAL; 205 return -EINVAL;
206 206
207 if (uaddr & queue_dma_alignment(q)) { 207 /*
208 * Keep going so we check length of all segments
209 */
210 if (uaddr & queue_dma_alignment(q))
208 unaligned = 1; 211 unaligned = 1;
209 break;
210 }
211 } 212 }
212 213
213 if (unaligned || (q->dma_pad_mask & len) || map_data) 214 if (unaligned || (q->dma_pad_mask & len) || map_data)