Skip to content

Commit 0fabd29

Browse files
alexdewargregkh
authored andcommitted
VMCI: check return value of get_user_pages_fast() for errors
[ Upstream commit 90ca633 ] In a couple of places in qp_host_get_user_memory(), get_user_pages_fast() is called without properly checking for errors. If e.g. -EFAULT is returned, this negative value will then be passed on to qp_release_pages(), which expects a u64 as input. Fix this by only calling qp_release_pages() when we have a positive number returned. Fixes: 06164d2 ("VMCI: queue pairs implementation.") Signed-off-by: Alex Dewar <alex.dewar90@gmail.com> Link: https://lore.kernel.org/r/20200825164522.412392-1-alex.dewar90@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 2bef304 commit 0fabd29

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

drivers/misc/vmw_vmci/vmci_queue_pair.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -657,8 +657,9 @@ static int qp_host_get_user_memory(u64 produce_uva,
657657
if (retval < (int)produce_q->kernel_if->num_pages) {
658658
pr_debug("get_user_pages_fast(produce) failed (retval=%d)",
659659
retval);
660-
qp_release_pages(produce_q->kernel_if->u.h.header_page,
661-
retval, false);
660+
if (retval > 0)
661+
qp_release_pages(produce_q->kernel_if->u.h.header_page,
662+
retval, false);
662663
err = VMCI_ERROR_NO_MEM;
663664
goto out;
664665
}
@@ -670,8 +671,9 @@ static int qp_host_get_user_memory(u64 produce_uva,
670671
if (retval < (int)consume_q->kernel_if->num_pages) {
671672
pr_debug("get_user_pages_fast(consume) failed (retval=%d)",
672673
retval);
673-
qp_release_pages(consume_q->kernel_if->u.h.header_page,
674-
retval, false);
674+
if (retval > 0)
675+
qp_release_pages(consume_q->kernel_if->u.h.header_page,
676+
retval, false);
675677
qp_release_pages(produce_q->kernel_if->u.h.header_page,
676678
produce_q->kernel_if->num_pages, false);
677679
err = VMCI_ERROR_NO_MEM;

0 commit comments

Comments
 (0)