]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/msm/dsi: Fix some reference counted resource leaks
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Fri, 6 Aug 2021 09:15:13 +0000 (11:15 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 15 Sep 2021 07:50:38 +0000 (09:50 +0200)
[ Upstream commit 6977cc89c87506ff17e6c05f0e37f46752256e82 ]

'of_find_device_by_node()' takes a reference that must be released when
not needed anymore.
This is expected to be done in 'dsi_destroy()'.

However, there are 2 issues in 'dsi_get_phy()'.

First, if 'of_find_device_by_node()' succeeds but 'platform_get_drvdata()'
returns NULL, 'msm_dsi->phy_dev' will still be NULL, and the reference
won't be released in 'dsi_destroy()'.

Secondly, as 'of_find_device_by_node()' already takes a reference, there is
no need for an additional 'get_device()'.

Move the assignment to 'msm_dsi->phy_dev' a few lines above and remove the
unneeded 'get_device()' to solve both issues.

Fixes: ec31abf6684e ("drm/msm/dsi: Separate PHY to another platform device")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/f15bc57648a00e7c99f943903468a04639d50596.1628241097.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Rob Clark <robdclark@chromium.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/msm/dsi/dsi.c

index 627048851d99c5699e7f654becaf40c2a1eb6fb6..7e364b9c9f9e102b64f5e9cf4ef850f652e6bfe2 100644 (file)
@@ -26,8 +26,10 @@ static int dsi_get_phy(struct msm_dsi *msm_dsi)
        }
 
        phy_pdev = of_find_device_by_node(phy_node);
-       if (phy_pdev)
+       if (phy_pdev) {
                msm_dsi->phy = platform_get_drvdata(phy_pdev);
+               msm_dsi->phy_dev = &phy_pdev->dev;
+       }
 
        of_node_put(phy_node);
 
@@ -36,8 +38,6 @@ static int dsi_get_phy(struct msm_dsi *msm_dsi)
                return -EPROBE_DEFER;
        }
 
-       msm_dsi->phy_dev = get_device(&phy_pdev->dev);
-
        return 0;
 }