iommu/omap: Fix missing put_device() call in omap_iommu_probe_device
PATCH 1/1 iommu/omap: Fix missing put_device() call in omap_iommu_probe_device
The reference taken by 'of_find_device_by_node()' must be released when not needed anymore.
Add the corresponding 'put_device()' in the error handling paths.
--- drivers/iommu/omap-iommu.c | 1 + 1 file changed, 1 insertion(+)
drivers/iommu/omap-iommu.c +1 -0
@@ -1684,6 +1684,7 @@ static struct iommu_device *omap_iommu_probe_device(struct device *dev) oiommu =platform_get_drvdata (pdev);if (!oiommu) {of_node_put (np); +put_device (&pdev->dev);kfree (arch_data);return ERR_PTR (-EINVAL ); }
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Hi Miaoqian,
Quoted 2 lines · Miaoqian Lin
The reference taken by '
of_find_device_by_node()' must be released when not needed anymore.
Thanks for catching this.
Quoted 1 line
Add the corresponding '
put_device()' in the error handling paths.
Also, need it in the regular path, not just in error handling path.
Quoted 12 lines
Fixes ede1c2e7d4dc ("iommu/omap: Store iommu_dev pointer in arch_data")Signed-off-by Miaoqian Lin <[email protected]>--- drivers/iommu/omap-iommu.c | 1 + 1 file changed, 1 insertion(+)drivers/iommu/omap-iommu.c +0
-0
drivers/iommu/omap-iommu.c static struct iommu_device *omap_iommu_probe_device(struct device *dev) · line 1687
Quoted 4 lines
drivers/iommu/omap-iommu.c +1
-0@@ -1684,6 +1684,7 @@ static struct iommu_device *omap_iommu_probe_device(struct device *dev) oiommu =platform_get_drvdata (pdev);if (!oiommu) {of_node_put (np); +put_device (&pdev->dev);
nit, doesn't matter for functionality, but prefer the put_device before of_node_put().
regards
Suman
Quoted 4 lines
drivers/iommu/omap-iommu.c +0
-0kfree (arch_data);return ERR_PTR (-EINVAL ); }
Hi Suman Anna,
Quoted 6 lines · Suman Anna
Hi Miaoqian,
Quoted 1 line
Add the corresponding '
put_device()' in the error handling paths.Also, need it in the regular path, not just in error handling path.
I think after calling platform_get_drvdata() normally, the reference will be released in other functions, so don't need it in the regular path.
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Hi Miaoqian,
Quoted 5 lines · Miaoqian Lin
Hi Suman Anna,
Quoted 3 lines · Suman Anna
Hi Miaoqian,
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Add the corresponding '
put_device()' in the error handling paths.Also, need it in the regular path, not just in error handling path.
I think after calling
platform_get_drvdata()normally, the reference will be released in other functions, so don't need it in the regular path.
No, it's a local reference and is acquired within omap_iommu_probe_device() and needs to be released within this function. What other function are you referring to here?
regards
Suman
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Hi Suman,
Quoted 11 lines · Suman Anna
Hi Miaoqian,
Quoted 8 lines · Miaoqian Lin
Hi Suman Anna,
Quoted 6 lines · Suman Anna
Hi Miaoqian,
Quoted 1 line
Add the corresponding '
put_device()' in the error handling paths.Also, need it in the regular path, not just in error handling path.
Quoted 9 lines
Quoted 4 lines
I think after calling
platform_get_drvdata()normally, the reference will be released in other functions, so don't need it in the regular path.No, it's a local reference and is acquired within
omap_iommu_probe_device()and needs to be released within this function. What other function are you referring to here?
I am referring to the release function of this device, here is omap_iommu_release_device(). But I find omap_iommu_release_device() doesn't handle the reference, and calls kfree(arch_data) directly.
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v2 1/1 iommu/omap: Fix missing put_device() call in omap_iommu_probe_device
In reply to Suman AnnaThe reference taken by 'of_find_device_by_node()' must be released when not needed anymore.
Add the corresponding 'put_device()' in the error handling path and the regular path.
---
changes in v2:
- move put_device() before of_node_put().
- add put_device() in the regular path.
--- drivers/iommu/omap-iommu.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/iommu/omap-iommu.c +2 -0
@@ -1683,6 +1683,7 @@ static struct iommu_device *omap_iommu_probe_device(struct device *dev) oiommu =platform_get_drvdata (pdev);if (!oiommu) { +put_device (&pdev->dev);of_node_put (np);kfree (arch_data);return ERR_PTR (-EINVAL );
@@ -1691,6 +1692,7 @@ static struct iommu_device *omap_iommu_probe_device(struct device *dev) tmp->iommu_dev = oiommu; tmp->dev = &pdev->dev; +put_device (&pdev->dev);of_node_put (np); }
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu