Fix: vmw_vmci driver get_user_pages_fast error handling
Subsystems (3)
PATCH 1/1 Fix: vmw_vmci driver get_user_pages_fast error handling
Comparing a signed return value against an unsigned num_pages field performs the comparison as "unsigned", and therefore mistakenly considers get_user_pages_fast() errors as success.
--- drivers/misc/vmw_vmci/vmci_queue_pair.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/misc/vmw_vmci/vmci_queue_pair.c +2 -2
@@ -755,7 +755,7 @@ static int qp_host_get_user_memory(u64 produce_uva, retval =get_user_pages_fast ((uintptr_t ) produce_uva, produce_q->kernel_if->num_pages,1 , produce_q->kernel_if->u.h.header_page); -if (retval < produce_q->kernel_if->num_pages) { +if (retval <0 || retval < produce_q->kernel_if->num_pages) {pr_debug ("get_user_pages_fast(produce) failed (retval=%d)" , retval); qp_release_pages(produce_q->kernel_if->u.h.header_page,
@@ -767,7 +767,7 @@ static int qp_host_get_user_memory(u64 produce_uva, retval =get_user_pages_fast ((uintptr_t ) consume_uva, consume_q->kernel_if->num_pages,1 , consume_q->kernel_if->u.h.header_page); -if (retval < consume_q->kernel_if->num_pages) { +if (retval <0 || retval < consume_q->kernel_if->num_pages) {pr_debug ("get_user_pages_fast(consume) failed (retval=%d)" , retval); qp_release_pages(consume_q->kernel_if->u.h.header_page,
Signature · 1 line
2.11.0
Al Viro
maintainerQuoted 3 lines · Mathieu Desnoyers
Comparing a signed return value against an unsigned
num_pagesfield performs the comparison as "unsigned", and therefore mistakenly considersget_user_pages_fast()errors as success.
It's worse than that - if you look into the code in question you'll see
pr_debug("get_user_pages_fast(produce) failed (retval=%d)",
retval);
qp_release_pages(produce_q->kernel_if->u.h.header_page,
retval, false);
err = VMCI_ERROR_NO_MEM;
goto out;
with
static void qp_release_pages(struct page **pages,
u64 num_pages, bool dirty)
{
int i;
for (i = 0; i < num_pages; i++) {
if (dirty)
set_page_dirty(pages[i]);
put_page(pages[i]);
pages[i] = NULL;
}
}Now, guess what'll happen if you get there with retval being negative? AFAICS, the right fix is something along the lines of
if (retval != produce_q->kernel_if->num_pages) {
pr_debug("get_user_pages_fast(produce) failed (retval=%d)",
retval);
if (retval > 0)
qp_release_pages(produce_q->kernel_if->u.h.header_page,
retval, false);
err = VMCI_ERROR_NO_MEM;
goto out;
}and similar for the second caller. Objections?
Quoted 28 lines · ----- On Nov 2, 2017, at 2:46 PM, Alexander Viro [email protected] wrote:
Quoted 3 lines · Mathieu Desnoyers
Comparing a signed return value against an unsigned
num_pagesfield performs the comparison as "unsigned", and therefore mistakenly considersget_user_pages_fast()errors as success.It's worse than that - if you look into the code in question you'll see
pr_debug("get_user_pages_fast(produce) failed (retval=%d)", retval); qp_release_pages(produce_q->kernel_if->u.h.header_page, retval, false); err = VMCI_ERROR_NO_MEM; goto out; with static void qp_release_pages(struct page **pages, u64 num_pages, bool dirty) { int i; for (i = 0; i < num_pages; i++) { if (dirty) set_page_dirty(pages[i]); put_page(pages[i]); pages[i] = NULL; } }
Quoted 1 line
Now, guess what'll happen if you get there with retval being negative?
Well this ought to be a pretty long loop...
Quoted 11 lines
AFAICS, the right fix is something along the lines of
if (retval != produce_q->kernel_if->num_pages) { pr_debug("get_user_pages_fast(produce) failed (retval=%d)", retval); if (retval > 0) qp_release_pages(produce_q->kernel_if->u.h.header_page, retval, false); err = VMCI_ERROR_NO_MEM; goto out; }and similar for the second caller. Objections?
No objection from me,
Thanks!
Mathieu
Signature · 3 lines
Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com