diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2011-11-13 19:58:09 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2011-11-13 19:58:09 +0100 |
| commit | 6b76106d8ef31111d6fc469564b83b5f5542794f (patch) | |
| tree | 3df7d414b200aa07f083f70a1c4f5c8da7a11043 | |
| parent | 193733585692301f38d489b8ad8724c2f88349c0 (diff) | |
| download | linux-6b76106d8ef31111d6fc469564b83b5f5542794f.tar.gz linux-6b76106d8ef31111d6fc469564b83b5f5542794f.tar.bz2 linux-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>
| -rw-r--r-- | block/blk-map.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/block/blk-map.c b/block/blk-map.c index e663ac2d8e68..164cd0059706 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, 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) |