Commit 38815b78 authored by Sage Weil's avatar Sage Weil

libceph: fix handling of short returns from get_user_pages

get_user_pages() can return fewer pages than we ask for.  We were returning
a bogus pointer/error code in that case.  Instead, loop until we get all
the pages we want or get an error we can return to the caller.
Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent 16a8b70a
...@@ -16,22 +16,30 @@ struct page **ceph_get_direct_page_vector(const char __user *data, ...@@ -16,22 +16,30 @@ struct page **ceph_get_direct_page_vector(const char __user *data,
int num_pages, bool write_page) int num_pages, bool write_page)
{ {
struct page **pages; struct page **pages;
int rc; int got = 0;
int rc = 0;
pages = kmalloc(sizeof(*pages) * num_pages, GFP_NOFS); pages = kmalloc(sizeof(*pages) * num_pages, GFP_NOFS);
if (!pages) if (!pages)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
down_read(&current->mm->mmap_sem); down_read(&current->mm->mmap_sem);
rc = get_user_pages(current, current->mm, (unsigned long)data, while (got < num_pages) {
num_pages, write_page, 0, pages, NULL); rc = get_user_pages(current, current->mm,
(unsigned long)data + ((unsigned long)got * PAGE_SIZE),
num_pages - got, write_page, 0, pages + got, NULL);
if (rc < 0)
break;
BUG_ON(rc == 0);
got += rc;
}
up_read(&current->mm->mmap_sem); up_read(&current->mm->mmap_sem);
if (rc < num_pages) if (rc < 0)
goto fail; goto fail;
return pages; return pages;
fail: fail:
ceph_put_page_vector(pages, rc > 0 ? rc : 0, false); ceph_put_page_vector(pages, got, false);
return ERR_PTR(rc); return ERR_PTR(rc);
} }
EXPORT_SYMBOL(ceph_get_direct_page_vector); EXPORT_SYMBOL(ceph_get_direct_page_vector);
......
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