* [PATCH] block: check for proper length of iov entries earlier in blk_rq_map_user_iov()
@ 2010-11-29 9:00 Xiaotian Feng
2010-11-29 9:04 ` Jens Axboe
0 siblings, 1 reply; 2+ messages in thread
From: Xiaotian Feng @ 2010-11-29 9:00 UTC (permalink / raw)
To: linux-kernel; +Cc: Xiaotian Feng, Jens Axboe
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.
Signed-off-by: Xiaotian Feng <dfeng@redhat.com>
Cc: Jens Axboe <axboe@kernel.dk>
---
block/blk-map.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/block/blk-map.c b/block/blk-map.c
index 5d5dbe4..e663ac2 100644
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -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)
--
1.7.3.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] block: check for proper length of iov entries earlier in blk_rq_map_user_iov()
2010-11-29 9:00 [PATCH] block: check for proper length of iov entries earlier in blk_rq_map_user_iov() Xiaotian Feng
@ 2010-11-29 9:04 ` Jens Axboe
0 siblings, 0 replies; 2+ messages in thread
From: Jens Axboe @ 2010-11-29 9:04 UTC (permalink / raw)
To: Xiaotian Feng; +Cc: linux-kernel
On 2010-11-29 10:00, Xiaotian Feng wrote:
> 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.
--
Jens Axboe
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-11-29 9:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-29 9:00 [PATCH] block: check for proper length of iov entries earlier in blk_rq_map_user_iov() Xiaotian Feng
2010-11-29 9:04 ` Jens Axboe
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.