Commit 725f3f3b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'vfio-v6.0-rc5' of https://github.com/awilliam/linux-vfio 

Pull VFIO fix from Alex Williamson:

 - Fix zero page refcount leak (Alex Williamson)

* tag 'vfio-v6.0-rc5' of https://github.com/awilliam/linux-vfio:
  vfio/type1: Unpin zero pages
parents 83dfc0e2 873aefb3

drivers/vfio/vfio_iommu_type1.c

+12 −0
Original line number Diff line number Diff line
@@ -558,6 +558,18 @@ static int vaddr_get_pfns(struct mm_struct *mm, unsigned long vaddr, 
	ret = pin_user_pages_remote(mm, vaddr, npages, flags | FOLL_LONGTERM,

				    pages, NULL, NULL);

	if (ret > 0) {

		int i;



		/*

		 * The zero page is always resident, we don't need to pin it

		 * and it falls into our invalid/reserved test so we don't

		 * unpin in put_pfn().  Unpin all zero pages in the batch here.

		 */

		for (i = 0 ; i < ret; i++) {

			if (unlikely(is_zero_pfn(page_to_pfn(pages[i]))))

				unpin_user_page(pages[i]);

		}



		*pfn = page_to_pfn(pages[0]);

		goto done;

	}