diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2010-10-29 08:10:18 -0600 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2010-12-14 23:40:00 +0100 |
| commit | e978df456e01ff5412c29e6fef5dd47960867476 (patch) | |
| tree | 776bb1028368b1400d2d016913641bb055d78649 /block | |
| parent | 116ad352e4fefafd5d6abc819691e61603604bee (diff) | |
block: check for proper length of iov entries in blk_rq_map_user_iov()
commit 9284bcf4e335e5f18a8bc7b26461c33ab60d0689 upstream.
Ensure that we pass down properly validated iov segments before
calling into the mapping or copy functions.
Reported-by: Dan Rosenberg <drosenberg@vsecurity.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-map.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/blk-map.c b/block/blk-map.c index 9083cf0180cc..30a7e5158930 100644 --- a/block/blk-map.c +++ b/block/blk-map.c @@ -205,6 +205,8 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq, unaligned = 1; break; } + if (!iov[i].iov_len) + return -EINVAL; } if (unaligned || (q->dma_pad_mask & len) || map_data) |