iommu/mediatek: Use correct fwspec in mtk_iommu_add_device()
Subsystems (3)
Joerg Roedel
maintainerPATCH 1/1 iommu/mediatek: Use correct fwspec in mtk_iommu_add_device()
From: Joerg Roedel <[email protected]>
The mtk_iommu_add_device() function keeps the fwspec in an on-stack pointer and calls mtk_iommu_create_mapping(), which might change its source, dev->iommu_fwspec. This causes the on-stack pointer to be obsoleted and the device initialization to fail. Update the on-stack fwspec pointer after mtk_iommu_create_mapping() has been called.
Reported-by Frank Wunderlich <[email protected]>
Fixes a9bf2eec5a6f ('iommu/mediatek: Use helper functions to access dev->iommu_fwspec')
Signed-off-by Joerg Roedel <[email protected]>
--- drivers/iommu/mtk_iommu_v1.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/iommu/mtk_iommu_v1.c +4 -0
@@ -442,6 +442,10 @@ static int mtk_iommu_add_device(struct device *dev) iommu_spec.args_count = count;mtk_iommu_create_mapping (dev, &iommu_spec); + +/* dev->iommu_fwspec might have changed */ + fwspec =dev_iommu_fwspec_get (dev); +of_node_put (iommu_spec.np); }
Signature · 1 line
2.13.7
Tested-by Frank Wunderlich <[email protected]>