Skip to contentSkip to conversation

block: Always check length of all iov entries in blk_rq_map_user_iov()

PATCH In review Ben Hutchings 2 participants 2 messages Nov 13, 2011 Block layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 block/blk-map.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
block/blk-map.c +1 -3
index e663ac2..2e852a4 100644
@@ -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)
Signature · 1 line
1.7.7.2
maintainer
#1 lore raw
Quoted 4 lines · Ben Hutchings

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.

Thanks, that is an oversight. Applied.

Signature · 1 line
Jens Axboe