Skip to contentSkip to conversation

block: check for proper length of iov entries earlier in blk_rq_map_user_iov()

PATCH In review Xiaotian Feng 2 participants 2 messages Nov 29, 2010 Block layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 block: check for proper length of iov entries earlier in blk_rq_map_user_iov()

commit 9284bcf checks for proper length of iov entries in blk_rq_map_user_iov(). But if the map is unaligned, kernel will break out the loop without checking for the proper length. So we need to check the proper length before the unalign check.

---
 block/blk-map.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
block/blk-map.c +3 -2
index 5d5dbe4..e663ac2 100644
@@ -201,12 +201,13 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,
 	for (i = 0; i < iov_count; i++) {
 		unsigned long uaddr = (unsigned long)iov[i].iov_base;
 
+		if (!iov[i].iov_len)
+			return -EINVAL;
+
 		if (uaddr & queue_dma_alignment(q)) {
 			unaligned = 1;
 			break;
 		}
-		if (!iov[i].iov_len)
-			return -EINVAL;
 	}
 
 	if (unaligned || (q->dma_pad_mask & len) || map_data)
Signature · 1 line
1.7.3.2
maintainer
#1 lore raw
Quoted 4 lines · Xiaotian Feng

commit 9284bcf checks for proper length of iov entries in blk_rq_map_user_iov(). But if the map is unaligned, kernel will break out the loop without checking for the proper length. So we need to check the proper length before the unalign check.

Thanks, good catch. Applied.

Signature · 1 line
Jens Axboe