Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 361cf405 authored by Henry C Chang's avatar Henry C Chang Committed by Sage Weil
Browse files

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: default avatarHenry C Chang <henry_c_chang@tcloudcomputing.com>
Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent b6aa5901

net/ceph/pagevec.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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,

	rc = get_user_pages(current, current->mm, (unsigned long)data,

			    num_pages, write_page, 0, pages, NULL);

			    num_pages, write_page, 0, pages, NULL);

	up_read(&current->mm->mmap_sem);

	up_read(&current->mm->mmap_sem);

	if (rc < 0)

	if (rc < num_pages)

		goto fail;

		goto fail;

	return pages;

	return pages;





fail:

fail:

	kfree(pages);

	ceph_put_page_vector(pages, rc > 0 ? rc : 0, false);

	return ERR_PTR(rc);

	return ERR_PTR(rc);

}

}

EXPORT_SYMBOL(ceph_get_direct_page_vector);

EXPORT_SYMBOL(ceph_get_direct_page_vector);