Skip to content

Commit

Permalink
bio: take care not overflow page count when mapping/copying user data
Browse files Browse the repository at this point in the history
If the iovec is being set up in a way that causes uaddr + PAGE_SIZE
to overflow, we could end up attempting to map a huge number of
pages. Check for this invalid input type.

Reported-by: Dan Rosenberg <drosenberg@vsecurity.com>
Cc: stable@kernel.org
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
  • Loading branch information
Jens Axboe committed Nov 10, 2010
1 parent f3f63c1 commit cb4644c
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion fs/bio.c
Original file line number Diff line number Diff line change
Expand Up @@ -834,6 +834,12 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
end = (uaddr + iov[i].iov_len + PAGE_SIZE - 1) >> PAGE_SHIFT;
start = uaddr >> PAGE_SHIFT;

/*
* Overflow, abort
*/
if (end < start)
return ERR_PTR(-EINVAL);

nr_pages += end - start;
len += iov[i].iov_len;
}
Expand Down Expand Up @@ -962,6 +968,12 @@ static struct bio *__bio_map_user_iov(struct request_queue *q,
unsigned long end = (uaddr + len + PAGE_SIZE - 1) >> PAGE_SHIFT;
unsigned long start = uaddr >> PAGE_SHIFT;

/*
* Overflow, abort
*/
if (end < start)
return ERR_PTR(-EINVAL);

nr_pages += end - start;
/*
* buffer must be aligned to at least hardsector size for now
Expand Down Expand Up @@ -989,7 +1001,7 @@ static struct bio *__bio_map_user_iov(struct request_queue *q,
unsigned long start = uaddr >> PAGE_SHIFT;
const int local_nr_pages = end - start;
const int page_limit = cur_page + local_nr_pages;

ret = get_user_pages_fast(uaddr, local_nr_pages,
write_to_vm, &pages[cur_page]);
if (ret < local_nr_pages) {
Expand Down

0 comments on commit cb4644c

Please sign in to comment.