* [PATCH] block: Always check length of all iov entries in blk_rq_map_user_iov()
@ 2011-11-13 18:55 Ben Hutchings
2011-11-13 18:57 ` Jens Axboe
0 siblings, 1 reply; 2+ messages in thread
From: Ben Hutchings @ 2011-11-13 18:55 UTC (permalink / raw)
To: Jens Axboe; +Cc: Xiaotian Feng, Dan Rosenberg, Dan Carpenter, LKML
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
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-11-13 18:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-13 18:55 [PATCH] block: Always check length of all iov entries in blk_rq_map_user_iov() Ben Hutchings
2011-11-13 18:57 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox