35 lines
1002 B
Diff
35 lines
1002 B
Diff
From: Ben Hutchings <ben@decadent.org.uk>
|
|
Date: Sun, 13 Nov 2011 18:42:46 +0000
|
|
Subject: [PATCH] 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>
|
|
---
|
|
block/blk-map.c | 4 +---
|
|
1 files changed, 1 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/block/blk-map.c b/block/blk-map.c
|
|
index e663ac2..2e852a4 100644
|
|
--- a/block/blk-map.c
|
|
+++ b/block/blk-map.c
|
|
@@ -204,10 +204,8 @@ 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)) {
|
|
+ if (uaddr & queue_dma_alignment(q))
|
|
unaligned = 1;
|
|
- break;
|
|
- }
|
|
}
|
|
|
|
if (unaligned || (q->dma_pad_mask & len) || map_data)
|
|
--
|
|
1.7.7.2
|
|
|