2020-09-18 01:13:53

by Yu Kuai

Subject: [PATCH] iommu/exynos: add missing put_device() call in exynos_iommu_of_xlate()

if of_find_device_by_node() succeed, exynos_iommu_of_xlate() doesn't have
a corresponding put_device(). Thus add put_device() to fix the exception
handling for this function implementation.

Fixes: aa759fd376fb ("iommu/exynos: Add callback for initializing devices from device tree")
Signed-off-by: Yu Kuai <[email protected]>
---
drivers/iommu/exynos-iommu.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
index bad3c0ce10cb..de324b4eedfe 100644
--- a/drivers/iommu/exynos-iommu.c
+++ b/drivers/iommu/exynos-iommu.c
@@ -1295,13 +1295,17 @@ static int exynos_iommu_of_xlate(struct device *dev,
return -ENODEV;

data = platform_get_drvdata(sysmmu);
- if (!data)
+ if (!data) {
+ put_device(&sysmmu->dev);
return -ENODEV;
+ }

if (!owner) {
owner = kzalloc(sizeof(*owner), GFP_KERNEL);
- if (!owner)
+ if (!owner) {
+ put_device(&sysmmu->dev);
return -ENOMEM;
+ }

INIT_LIST_HEAD(&owner->controllers);
mutex_init(&owner->rpm_lock);
--
2.25.4

2020-09-18 15:30:16

by Marek Szyprowski

Subject: Re: [PATCH] iommu/exynos: add missing put_device() call in exynos_iommu_of_xlate()

Hi

On 18.09.2020 03:13, Yu Kuai wrote:
> if of_find_device_by_node() succeed, exynos_iommu_of_xlate() doesn't have
> a corresponding put_device(). Thus add put_device() to fix the exception
> handling for this function implementation.
>
> Fixes: aa759fd376fb ("iommu/exynos: Add callback for initializing devices from device tree")
> Signed-off-by: Yu Kuai <[email protected]>

Thanks for the fix!

Acked-by: Marek Szyprowski <[email protected]>

> ---
> drivers/iommu/exynos-iommu.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c
> index bad3c0ce10cb..de324b4eedfe 100644
> --- a/drivers/iommu/exynos-iommu.c
> +++ b/drivers/iommu/exynos-iommu.c
> @@ -1295,13 +1295,17 @@ static int exynos_iommu_of_xlate(struct device *dev,
> return -ENODEV;
>
> data = platform_get_drvdata(sysmmu);
> - if (!data)
> + if (!data) {
> + put_device(&sysmmu->dev);
> return -ENODEV;
> + }
>
> if (!owner) {
> owner = kzalloc(sizeof(*owner), GFP_KERNEL);
> - if (!owner)
> + if (!owner) {
> + put_device(&sysmmu->dev);
> return -ENOMEM;
> + }
>
> INIT_LIST_HEAD(&owner->controllers);
> mutex_init(&owner->rpm_lock);

Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland

2020-09-24 08:50:18

by Joerg Roedel

Subject: Re: [PATCH] iommu/exynos: add missing put_device() call in exynos_iommu_of_xlate()

On Fri, Sep 18, 2020 at 05:27:59PM +0200, Marek Szyprowski wrote:
> Hi
>
> On 18.09.2020 03:13, Yu Kuai wrote:
> > if of_find_device_by_node() succeed, exynos_iommu_of_xlate() doesn't have
> > a corresponding put_device(). Thus add put_device() to fix the exception
> > handling for this function implementation.
> >
> > Fixes: aa759fd376fb ("iommu/exynos: Add callback for initializing devices from device tree")
> > Signed-off-by: Yu Kuai <[email protected]>
>
> Thanks for the fix!
>
> Acked-by: Marek Szyprowski <[email protected]>

Applied for v5.9, thanks.