From d798a0952903db9d8ee0a580e03f214d2b49b7d7 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Tue, 27 Feb 2018 14:03:27 +0100 Subject: [PATCH] memory: don't implicitly unpin for decrease-reservation It very likely was a mistake (copy-and-paste from domain cleanup code) to implicitly unpin here: The caller should really unpin itself before (or after, if they so wish) requesting the page to be removed. This is XSA-252. Reported-by: Jann Horn Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/common/memory.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index 59d23a2a98..3ed71f8f74 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -360,11 +360,6 @@ int guest_remove_page(struct domain *d, unsigned long gmfn) rc = guest_physmap_remove_page(d, _gfn(gmfn), mfn, 0); -#ifdef _PGT_pinned - if ( !rc && test_and_clear_bit(_PGT_pinned, &page->u.inuse.type_info) ) - put_page_and_type(page); -#endif - /* * With the lack of an IOMMU on some platforms, domains with DMA-capable * device must retrieve the same pfn when the hypercall populate_physmap -- 2.39.5