Commit f2c8bbb6 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'mediatek-drm-fixes-20250910' of... 

Merge tag 'mediatek-drm-fixes-20250910' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux

 into drm-fixes

Mediatek DRM Fixes - 20250910

1. fix potential OF node use-after-free

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Link: https://lore.kernel.org/r/20250910231813.3526-1-chunkuang.hu@kernel.org
parents 1d00adb8 9ba2556c

drivers/gpu/drm/mediatek/mtk_drm_drv.c

+9 −14
Original line number Diff line number Diff line
@@ -387,19 +387,21 @@ static bool mtk_drm_get_all_drm_priv(struct device *dev) 


		of_id = of_match_node(mtk_drm_of_ids, node);

		if (!of_id)

			goto next_put_node;

			continue;



		pdev = of_find_device_by_node(node);

		if (!pdev)

			goto next_put_node;

			continue;



		drm_dev = device_find_child(&pdev->dev, NULL, mtk_drm_match);

		put_device(&pdev->dev);

		if (!drm_dev)

			goto next_put_device_pdev_dev;

			continue;



		temp_drm_priv = dev_get_drvdata(drm_dev);

		put_device(drm_dev);

		if (!temp_drm_priv)

			goto next_put_device_drm_dev;

			continue;



		if (temp_drm_priv->data->main_len)

			all_drm_priv[CRTC_MAIN] = temp_drm_priv;
@@ -411,18 +413,11 @@ static bool mtk_drm_get_all_drm_priv(struct device *dev) 
		if (temp_drm_priv->mtk_drm_bound)

			cnt++;



next_put_device_drm_dev:

		put_device(drm_dev);



next_put_device_pdev_dev:

		put_device(&pdev->dev);



next_put_node:

		if (cnt == MAX_CRTC) {

			of_node_put(node);



		if (cnt == MAX_CRTC)

			break;

		}

	}



	if (drm_priv->data->mmsys_dev_num == cnt) {

		for (i = 0; i < cnt; i++)