[PATCH 4/9] ARM: dma-mapping: NULLify dev->archdata.mapping pointer on detach
From: Will Deacon <hidden>
Date: 2013-06-10 18:34:40
Also in:
linux-devicetree, linux-iommu
Subsystem:
arm port, the rest · Maintainers:
Russell King, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2013-06-19 · Re: [PATCH 4/9] ARM: dma-mapping: NULLify dev->archdata.mapping pointer on detach · Marek Szyprowski <hidden>
- 2013-06-11 · Re: [PATCH 4/9] ARM: dma-mapping: NULLify dev->archdata.mapping pointer on detach · Hiroshi Doyu <hidden>
- 2013-06-11 · Re: [PATCH 4/9] ARM: dma-mapping: NULLify dev->archdata.mapping pointer on detach · Will Deacon <hidden>
- 2013-06-11 · Re: [PATCH 4/9] ARM: dma-mapping: NULLify dev->archdata.mapping pointer on detach · Hiroshi Doyu <hidden>
The current code only clobbers a local variable, so the device is left with a stale mapping pointer. Cc: Hiroshi Doyu <redacted> Signed-off-by: Will Deacon <redacted> --- arch/arm/mm/dma-mapping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index d119de7..10282db 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c@@ -1921,7 +1921,7 @@ void arm_iommu_detach_device(struct device *dev) iommu_detach_device(mapping->domain, dev); kref_put(&mapping->kref, release_iommu_mapping); - mapping = NULL; + dev->archdata.mapping = NULL; set_dma_ops(dev, NULL); pr_debug("Detached IOMMU controller from %s device.\n", dev_name(dev));
--
1.8.2.2