summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenry C Chang <henry_c_chang@tcloudcomputing.com>2010-12-17 09:55:59 -0800
committerSage Weil <sage@newdream.net>2010-12-17 09:55:59 -0800
commit361cf40519a491f68b28ad90225e4611c4bf8e12 (patch)
treeac0a77f2d6b36d4140bbaf3b8c14a37e8ae1ef11
parentb6aa5901c7a2bd90d0b6b9866300d2648b2568f3 (diff)
downloadlinux-stable-361cf40519a491f68b28ad90225e4611c4bf8e12.tar.gz
linux-stable-361cf40519a491f68b28ad90225e4611c4bf8e12.tar.bz2
linux-stable-361cf40519a491f68b28ad90225e4611c4bf8e12.zip
ceph: handle partial result from get_user_pages
The get_user_pages() helper can return fewer than the requested pages. Error out in that case, and clean up the partial result. Signed-off-by: Henry C Chang <henry_c_chang@tcloudcomputing.com> Signed-off-by: Sage Weil <sage@newdream.net>
-rw-r--r--net/ceph/pagevec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ceph/pagevec.c b/net/ceph/pagevec.c
index 01947a5d03b7..1a040e64c69f 100644
--- a/net/ceph/pagevec.c
+++ b/net/ceph/pagevec.c
@@ -26,12 +26,12 @@ struct page **ceph_get_direct_page_vector(const char __user *data,
rc = get_user_pages(current, current->mm, (unsigned long)data,
num_pages, write_page, 0, pages, NULL);
up_read(&current->mm->mmap_sem);
- if (rc < 0)
+ if (rc < num_pages)
goto fail;
return pages;
fail:
- kfree(pages);
+ ceph_put_page_vector(pages, rc > 0 ? rc : 0, false);
return ERR_PTR(rc);
}
EXPORT_SYMBOL(ceph_get_direct_page_vector);