Commit 99172157 authored by Jens Axboe's avatar Jens Axboe Committed by Linus Torvalds
Browse files

[PATCH] Fix missing ret assignment in __bio_map_user() error path



If get_user_pages() returns less pages than what we asked for, we jump
to out_unmap which will return ERR_PTR(ret).  But ret can contain a
positive number just smaller than local_nr_pages, so be sure to set it
to -EFAULT always.

Problem found and diagnosed by Damien Le Moal <damien@sdl.hitachi.co.jp>
Signed-off-by: default avatarJens Axboe <axboe@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 16070428
...@@ -654,9 +654,10 @@ static struct bio *__bio_map_user_iov(request_queue_t *q, ...@@ -654,9 +654,10 @@ static struct bio *__bio_map_user_iov(request_queue_t *q,
write_to_vm, 0, &pages[cur_page], NULL); write_to_vm, 0, &pages[cur_page], NULL);
up_read(&current->mm->mmap_sem); up_read(&current->mm->mmap_sem);
if (ret < local_nr_pages) if (ret < local_nr_pages) {
ret = -EFAULT;
goto out_unmap; goto out_unmap;
}
offset = uaddr & ~PAGE_MASK; offset = uaddr & ~PAGE_MASK;
for (j = cur_page; j < page_limit; j++) { for (j = cur_page; j < page_limit; j++) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment