]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/rockchip: dw_hdmi: cleanup drm encoder during unbind
authorToby Chen <tobyc@nvidia.com>
Fri, 17 Mar 2023 00:51:26 +0000 (17:51 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 24 May 2023 16:32:35 +0000 (17:32 +0100)
[ Upstream commit b5af48eedcb53491c02ded55d5991e03d6da6dbf ]

This fixes a use-after-free crash during rmmod.

The DRM encoder is embedded inside the larger rockchip_hdmi,
which is allocated with the component. The component memory
gets freed before the main drm device is destroyed. Fix it
by running encoder cleanup before tearing down its container.

Signed-off-by: Toby Chen <tobyc@nvidia.com>
[moved encoder cleanup above clk_disable, similar to bind-error-path]
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230317005126.496-1-tobyc@nvidia.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c

index 2f4b8f64cbad33fdf4be3c4f27eea6a123816128..ae857bf8bd62480c1a8ca20a3149bf98d934290c 100644 (file)
@@ -640,6 +640,7 @@ static void dw_hdmi_rockchip_unbind(struct device *dev, struct device *master,
        struct rockchip_hdmi *hdmi = dev_get_drvdata(dev);
 
        dw_hdmi_unbind(hdmi->hdmi);
+       drm_encoder_cleanup(&hdmi->encoder.encoder);
        clk_disable_unprepare(hdmi->ref_clk);
 
        regulator_disable(hdmi->avdd_1v8);