| From 0488370c7698f8b5354a8e4190602145ddd21df6 Mon Sep 17 00:00:00 2001 |
| From: Jerry Snitselaar <jsnitsel@redhat.com> |
| Date: Thu, 17 Jan 2019 12:29:02 -0700 |
| Subject: iommu/amd: Call free_iova_fast with pfn in map_sg |
| |
| [ Upstream commit 51d8838d66d3249508940d8f59b07701f2129723 ] |
| |
| In the error path of map_sg, free_iova_fast is being called with |
| address instead of the pfn. This results in a bad value getting into |
| the rcache, and can result in hitting a BUG_ON when |
| iova_magazine_free_pfns is called. |
| |
| Cc: Joerg Roedel <joro@8bytes.org> |
| Cc: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com> |
| Signed-off-by: Jerry Snitselaar <jsnitsel@redhat.com> |
| Fixes: 80187fd39dcb ("iommu/amd: Optimize map_sg and unmap_sg") |
| Signed-off-by: Joerg Roedel <jroedel@suse.de> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/iommu/amd_iommu.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c |
| index 34c9aa76a7bd..2a5c05ca7fca 100644 |
| --- a/drivers/iommu/amd_iommu.c |
| +++ b/drivers/iommu/amd_iommu.c |
| @@ -2561,7 +2561,7 @@ static int map_sg(struct device *dev, struct scatterlist *sglist, |
| } |
| |
| out_free_iova: |
| - free_iova_fast(&dma_dom->iovad, address, npages); |
| + free_iova_fast(&dma_dom->iovad, address >> PAGE_SHIFT, npages); |
| |
| out_err: |
| return 0; |
| -- |
| 2.19.1 |
| |
