diff options
| author | Jerry Snitselaar <jsnitsel@redhat.com> | 2019-01-17 12:29:02 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-03-13 14:02:27 -0700 |
| commit | 697863bf7d724ad067988468b19f8b411993151b (patch) | |
| tree | 750c1ffc0c72782ba09a2abb5ed8a31b20597bed /drivers/iommu | |
| parent | 43b0c93918a0d208340343cf3fc923a060d86c93 (diff) | |
| download | linux-stable-697863bf7d724ad067988468b19f8b411993151b.tar.gz linux-stable-697863bf7d724ad067988468b19f8b411993151b.tar.bz2 linux-stable-697863bf7d724ad067988468b19f8b411993151b.zip | |
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>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/amd_iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ out_unmap: } 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; |