Skip to contentSkip to conversation

iommu/amd: unmap all mapped pages in error path of map_sg

PATCH New Jerry Snitselaar 1 participant 1 message Jan 19, 2019 IOMMU

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iommu/amd: unmap all mapped pages in error path of map_sg

In the error path of map_sg there is an incorrect if condition for breaking out of the loop that searches the scatterlist for mapped pages to unmap. Instead of breaking out of the loop once all the pages that were mapped have been unmapped, it will break out of the loop after it has unmapped 1 page. Fix the condition, so it breaks out of the loop only after all the mapped pages have been unmapped.

Fixes 80187fd39dcb ("iommu/amd: Optimize map_sg and unmap_sg")
Cc Joerg Roedel <[email protected]>
---
 drivers/iommu/amd_iommu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/amd_iommu.c +1 -1
index 1167ff0416cf..aeeca479f914 100644
@@ -2548,7 +2548,7 @@ static int map_sg(struct device *dev, struct scatterlist *sglist,
 			bus_addr  = address + s->dma_address + (j << PAGE_SHIFT);
 			iommu_unmap_page(domain, bus_addr, PAGE_SIZE);
 
-			if (--mapped_pages)
+			if (--mapped_pages == 0)
 				goto out_free_iova;
 		}
 	}
Signature · 1 line
2.20.1.98.gecbdaf0899