[lkml]   [2016]   [Sep]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[PATCH 4.7 058/143] iommu/dma: Dont put uninitialised IOVA domains
4.7-stable review patch.  If anyone has any objections, please let me know.


From: Robin Murphy <>

commit 3ec60043f7c02e1f79e4a90045ff2d2e80042941 upstream.

Due to the limitations of having to wait until we see a device's DMA
restrictions before we know how we want an IOVA domain initialised,
there is a window for error if a DMA ops domain is allocated but later
freed without ever being used. In that case, init_iova_domain() was
never called, so calling put_iova_domain() from iommu_put_dma_cookie()
ends up trying to take an uninitialised lock and crashing.

Make things robust by skipping the call unless the IOVA domain actually
has been initialised, as we probably should have done from the start.

Fixes: 0db2e5d18f76 ("iommu: Implement common IOMMU ops for DMA mapping")
Reported-by: Nate Watterson <>
Reviewed-by: Nate Watterson <>
Tested-by: Nate Watterson <>
Reviewed-by: Eric Auger <>
Tested-by: Eric Auger <>
Signed-off-by: Robin Murphy <>
Signed-off-by: Joerg Roedel <>
Signed-off-by: Greg Kroah-Hartman <>

drivers/iommu/dma-iommu.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

--- a/drivers/iommu/dma-iommu.c
+++ b/drivers/iommu/dma-iommu.c
@@ -68,7 +68,8 @@ void iommu_put_dma_cookie(struct iommu_d
if (!iovad)

- put_iova_domain(iovad);
+ if (iovad->granule)
+ put_iova_domain(iovad);
domain->iova_cookie = NULL;

 \ /
  Last update: 2016-09-17 09:58    [W:0.269 / U:0.136 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site