[4.18,156/168] iommu/amd: Clear memory encryption mask from physical address

Commit Message

Greg Kroah-Hartman Oct. 8, 2018, 6:32 p.m. UTC

4.18-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Singh, Brijesh <[e-mail]>

commit b3e9b515b08e407ab3a026dc2e4d935c48d05f69 upstream.

Boris Ostrovsky reported a memory leak with device passthrough when SME
is active.

The VFIO driver uses iommu_iova_to_phys() to get the physical address for
an iova. This physical address is later passed into vfio_unmap_unpin() to
unpin the memory. The vfio_unmap_unpin() uses pfn_valid() before unpinning
the memory. The pfn_valid() check was failing because encryption mask was
part of the physical address returned. This resulted in the memory not
being unpinned and therefore leaked after the guest terminates.

The memory encryption mask must be cleared from the physical address in
iommu_iova_to_phys().

Fixes: 2543a786aa25 ("iommu/amd: Allow the AMD IOMMU to work with memory encryption")
Reported-by: Boris Ostrovsky <[e-mail]>
Cc: Tom Lendacky <[e-mail]>
Cc: Joerg Roedel <[e-mail]>
Cc: <[e-mail]>
Cc: Borislav Petkov <[e-mail]>
Cc: Paolo Bonzini <[e-mail]>
Cc: Radim Krčmář <[e-mail]>
Cc: [e-mail]
Cc: Boris Ostrovsky <[e-mail]>
Cc: <[e-mail]> # 4.14+
Signed-off-by: Brijesh Singh <[e-mail]>
Signed-off-by: Joerg Roedel <[e-mail]>
Signed-off-by: Greg Kroah-Hartman <[e-mail]>

---
 drivers/iommu/amd_iommu.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -3073,7 +3073,7 @@  static phys_addr_t amd_iommu_iova_to_phy
 		return 0;
 
 	offset_mask = pte_pgsize - 1;
-	__pte	    = *pte & PM_ADDR_MASK;
+	__pte	    = __sme_clr(*pte & PM_ADDR_MASK);
 
 	return (__pte & ~offset_mask) | (iova & offset_mask);
 }