[PATCH] drm/mediatek: Add missing IS_ERR check for ovl_adaptor platform device

[PATCH] drm/mediatek: Add missing IS_ERR check for ovl_adaptor platform device

[Haojie Li]

platform_device_register_data() can fail and return an ERR_PTR, but the
return value is used without checking, leading to an invalid pointer
being stored in ddp_comp[].dev and passed to component_match_add() and
mtk_ddp_comp_init(), which could result in a kernel crash.

Add an IS_ERR() check to jump to the error handling path on failure.

Fixes: 0d9eee9118b7 ("drm/mediatek: Add drm ovl_adaptor sub driver for MT8195")
Cc: stable@vger.kernel.org
Signed-off-by: Haojie Li <lihaojie@kylinos.cn>
---
 drivers/gpu/drm/mediatek/mtk_drm_drv.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index c86a3f54f35b..667d7fdbfbac 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -1112,6 +1112,10 @@ static int mtk_drm_probe(struct platform_device *pdev)
 							    PLATFORM_DEVID_AUTO,
 							    (void *)private->mmsys_dev,
 							    sizeof(*private->mmsys_dev));
+		if (IS_ERR(ovl_adaptor)) {
+			ret = PTR_ERR(ovl_adaptor);
+			goto err_node;
+		}
 		private->ddp_comp[DDP_COMPONENT_DRM_OVL_ADAPTOR].dev = &ovl_adaptor->dev;
 		mtk_ddp_comp_init(dev, NULL, &private->ddp_comp[DDP_COMPONENT_DRM_OVL_ADAPTOR],
 				  DDP_COMPONENT_DRM_OVL_ADAPTOR);
-- 
2.25.1

Re: [PATCH] drm/mediatek: Add missing IS_ERR check for ovl_adaptor platform device

[sashiko-bot]

Thank you for your contribution! Sashiko AI review found 5 potential issue(s) to consider:

Pre-existing issues:
- [High] The dynamically registered `ovl_adaptor` platform device is leaked on probe error paths and during device removal, causing duplicate device accumulation.
- [High] `platform_device_register_data()` is misused to create a shallow, byte-for-byte clone of a `struct device` object.
- [High] `mtk_drm_bind()` mistakenly drops the `private->mutex_node` reference on `-EPROBE_DEFER`, causing an unbalanced put and potential use-after-free.
- [High] In `mtk_drm_of_ddp_path_build_one()`, if `mtk_drm_of_get_ddp_ep_cid()` fails early, it causes a double-put of the current device node in the loop.
- [Medium] In `mtk_drm_of_ddp_path_build_one()`, if the initial call to `mtk_drm_of_get_ddp_ep_cid()` fails but sets `next`, the acquired device node reference is leaked.
--

--- Patch [1]: [PATCH] drm/mediatek: Add missing IS_ERR check for ovl_adaptor platform device ---
commit 6317e1a251b60c3bf25295a5bff30bc7683eb97b
Author: Haojie Li <lihaojie@kylinos.cn>

drm/mediatek: Add missing IS_ERR check for ovl_adaptor platform device

This commit adds an IS_ERR() check after platform_device_register_data() in
mtk_drm_probe() to prevent a potential kernel crash due to an invalid pointer
dereference on error.

> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> index c86a3f54f35bc..667d7fdbfbac6 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> @@ -1112,6 +1112,10 @@ static int mtk_drm_probe(struct platform_device *pdev)
>  							    PLATFORM_DEVID_AUTO,
>  							    (void *)private->mmsys_dev,
>  							    sizeof(*private->mmsys_dev));

[Severity: High]
This isn't a bug introduced by this patch, but is it safe to pass
(void *)private->mmsys_dev and sizeof(*private->mmsys_dev) as the platform
data?

platform_device_register_data() kmemdups the provided memory into the new
device's platform_data. 

Copying the entire struct device object (including its kobject, mutexes,
and list heads) byte-for-byte might lead to subsystem operations running on
cloned and broken locks or kobjects when used by the OVL adaptor driver.

> +		if (IS_ERR(ovl_adaptor)) {
> +			ret = PTR_ERR(ovl_adaptor);
> +			goto err_node;
> +		}

[Severity: High]
This is a pre-existing issue, but is the dynamically registered ovl_adaptor
platform device leaked on probe error paths and during device removal?

If probe fails later (for example, returning -EPROBE_DEFER) and jumps to
err_node, or when mtk_drm_remove() is called, it doesn't look like
platform_device_unregister() is ever called.

This could leave orphaned devices accumulating on the platform bus.

>  		private->ddp_comp[DDP_COMPONENT_DRM_OVL_ADAPTOR].dev = &ovl_adaptor->dev;
>  		mtk_ddp_comp_init(dev, NULL, &private->ddp_comp[DDP_COMPONENT_DRM_OVL_ADAPTOR],
>  				  DDP_COMPONENT_DRM_OVL_ADAPTOR);

[ ... ]

> static int mtk_drm_bind(struct device *dev)
> {
>       ...
>		of_node_put(private->mutex_node);
>		return -EPROBE_DEFER;
>       ...
> }

[Severity: High]
This is a pre-existing issue, but does mtk_drm_bind() mistakenly drop the
private->mutex_node reference on -EPROBE_DEFER?

If it drops the reference here when the disp-mutex device is delayed, and the
driver is later unbound, mtk_drm_remove() will call of_node_put() again on
the same node pointer.

Could this cause an unbalanced put and potential use-after-free?

[ ... ]

> static int mtk_drm_of_ddp_path_build_one(...)
> {
>       ...
> 	ret = mtk_drm_of_get_ddp_ep_cid(vdo, 0, cpath, &next, &temp_path[idx]);
> 	if (ret) {
> 		if (next && temp_path[idx] == DDP_COMPONENT_DRM_OVL_ADAPTOR) {
> 			...
> 		} else {
> 			if (next)
> 				dev_err(dev, "Invalid component %pOF\n", next);
> 			else
> 				dev_err(dev, "Cannot find first endpoint for path %d\n", cpath);
>
> 			return ret;
> 		}
> 	}

[Severity: Medium]
This is a pre-existing issue, but does this initial error path leak the
acquired device node reference?

If mtk_drm_of_get_ddp_ep_cid() fails but still sets next, the code logs an
error and returns ret directly.

It doesn't appear to call of_node_put(next) before returning, which would
leave the reference dangling.

[ ... ]

> 	do {
> 		prev = next;
> 		ret = mtk_drm_of_get_ddp_ep_cid(next, 1, cpath, &next, &temp_path[idx]);
> 		of_node_put(prev);
> 		if (ret) {
> 			of_node_put(next);
> 			break;
> 		}

[Severity: High]
This is a pre-existing issue, but can this error path trigger a double-put of
the device node?

If mtk_drm_of_get_ddp_ep_cid() fails early (for example, returning -ENOENT)
without updating the next pointer, next will still point to prev.

The loop calls of_node_put(prev), and since ret is non-zero, it also
calls of_node_put(next). This would decrement the refcount of the same node
twice.

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20260819065642.136222-1-lihaojie@kylinos.cn?part=1

Re: [PATCH] drm/mediatek: Add missing IS_ERR check for ovl_adaptor platform device

[CK Hu (胡俊光)]

Hi, Haojie:

On Wed, 2026-08-19 at 14:56 +0800, Haojie Li wrote:
> External email : Please do not click links or open attachments until you have verified the sender or the content.
> 
> 
> platform_device_register_data() can fail and return an ERR_PTR, but the
> return value is used without checking, leading to an invalid pointer
> being stored in ddp_comp[].dev and passed to component_match_add() and
> mtk_ddp_comp_init(), which could result in a kernel crash.
> 
> Add an IS_ERR() check to jump to the error handling path on failure.
> 
> Fixes: 0d9eee9118b7 ("drm/mediatek: Add drm ovl_adaptor sub driver for MT8195")
> Cc: stable@vger.kernel.org
> Signed-off-by: Haojie Li <lihaojie@kylinos.cn>
> ---
>  drivers/gpu/drm/mediatek/mtk_drm_drv.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> index c86a3f54f35b..667d7fdbfbac 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> @@ -1112,6 +1112,10 @@ static int mtk_drm_probe(struct platform_device *pdev)
>                                                             PLATFORM_DEVID_AUTO,
>                                                             (void *)private->mmsys_dev,
>                                                             sizeof(*private->mmsys_dev));
> +               if (IS_ERR(ovl_adaptor)) {
> +                       ret = PTR_ERR(ovl_adaptor);
> +                       goto err_node;

return PTR_ERR(ovl_adaptor);

Regards,
CK

> +               }
>                 private->ddp_comp[DDP_COMPONENT_DRM_OVL_ADAPTOR].dev = &ovl_adaptor->dev;
>                 mtk_ddp_comp_init(dev, NULL, &private->ddp_comp[DDP_COMPONENT_DRM_OVL_ADAPTOR],
>                                   DDP_COMPONENT_DRM_OVL_ADAPTOR);
> --
> 2.25.1
> 
> 

[PATCH v2] drm/mediatek: Add missing IS_ERR check for ovl_adaptor platform device

[Haojie Li]

platform_device_register_data() can fail and return an ERR_PTR, but the
return value is used without checking, leading to an invalid pointer
being stored in ddp_comp[].dev and passed to component_match_add() and
mtk_ddp_comp_init(), which could result in a kernel crash.

Add an IS_ERR() check to jump to the error handling path on failure.

Fixes: 0d9eee9118b7 ("drm/mediatek: Add drm ovl_adaptor sub driver for MT8195")
Cc: stable@vger.kernel.org
Signed-off-by: Haojie Li <lihaojie@kylinos.cn>
---
 drivers/gpu/drm/mediatek/mtk_drm_drv.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index c86a3f54f35b..b281482ab8c8 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -1112,6 +1112,9 @@ static int mtk_drm_probe(struct platform_device *pdev)
 							    PLATFORM_DEVID_AUTO,
 							    (void *)private->mmsys_dev,
 							    sizeof(*private->mmsys_dev));
+		if (IS_ERR(ovl_adaptor))
+			return PTR_ERR(ovl_adaptor);
+
 		private->ddp_comp[DDP_COMPONENT_DRM_OVL_ADAPTOR].dev = &ovl_adaptor->dev;
 		mtk_ddp_comp_init(dev, NULL, &private->ddp_comp[DDP_COMPONENT_DRM_OVL_ADAPTOR],
 				  DDP_COMPONENT_DRM_OVL_ADAPTOR);
-- 
2.25.1

Re: [PATCH v2] drm/mediatek: Add missing IS_ERR check for ovl_adaptor platform device

[sashiko-bot]

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:

Pre-existing issues:
- [High] platform_device_register_data() is incorrectly used to create a shallow kmemdup copy of a 'struct device' object by value instead of passing a pointer.
--

--- Patch [1]: [PATCH v2] drm/mediatek: Add missing IS_ERR check for ovl_adaptor  platform device ---
commit 7a17d0a013a729b24666cfaf3097488acb16a27b
Author: Haojie Li <lihaojie@kylinos.cn>

drm/mediatek: Add missing IS_ERR check for ovl_adaptor platform device

This commit adds an IS_ERR() check for the return value of
platform_device_register_data() when initializing the ovl_adaptor
device. This prevents a potential kernel crash caused by using an
invalid pointer if the registration fails.

> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> index c86a3f54f35bc..b281482ab8c82 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> @@ -1112,6 +1112,9 @@ static int mtk_drm_probe(struct platform_device *pdev)
>  							    PLATFORM_DEVID_AUTO,
>  							    (void *)private->mmsys_dev,
>  							    sizeof(*private->mmsys_dev));

[Severity: High]
This isn't a bug introduced by this patch, but is it safe to pass
sizeof(*private->mmsys_dev) to platform_device_register_data() here?

The size parameter instructs platform_device_register_data() to kmemdup
the entire struct device object into the new platform device's platform_data.

Later in mtk_disp_ovl_adaptor_probe():

drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c:mtk_disp_ovl_adaptor_probe() {
    ...
    priv->mmsys_dev = pdev->dev.platform_data;
    ...
}

This extracts the cloned struct device object. Copying a struct device by
value duplicates its internal state (like kobjects, list heads, and locks).
If this cloned device is passed to generic device APIs, it could risk list
corruption, use-after-free, or power management state desynchronization.

Should this be passing a pointer to the device object instead of copying
the object by value?

> +		if (IS_ERR(ovl_adaptor))
> +			return PTR_ERR(ovl_adaptor);
> +
>  		private->ddp_comp[DDP_COMPONENT_DRM_OVL_ADAPTOR].dev = &ovl_adaptor->dev;
>  		mtk_ddp_comp_init(dev, NULL, &private->ddp_comp[DDP_COMPONENT_DRM_OVL_ADAPTOR],
>  				  DDP_COMPONENT_DRM_OVL_ADAPTOR);

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20260825100845.438893-1-lihaojie@kylinos.cn?part=1

Re: [PATCH v2] drm/mediatek: Add missing IS_ERR check for ovl_adaptor platform device

[CK Hu (胡俊光)]

On Tue, 2026-08-25 at 18:08 +0800, Haojie Li wrote:
> External email : Please do not click links or open attachments until you have verified the sender or the content.
> 
> 
> platform_device_register_data() can fail and return an ERR_PTR, but the
> return value is used without checking, leading to an invalid pointer
> being stored in ddp_comp[].dev and passed to component_match_add() and
> mtk_ddp_comp_init(), which could result in a kernel crash.
> 
> Add an IS_ERR() check to jump to the error handling path on failure.

Reviewed-by: CK Hu <ck.hu@mediatek.com>

> 
> Fixes: 0d9eee9118b7 ("drm/mediatek: Add drm ovl_adaptor sub driver for MT8195")
> Cc: stable@vger.kernel.org
> Signed-off-by: Haojie Li <lihaojie@kylinos.cn>
> ---
>  drivers/gpu/drm/mediatek/mtk_drm_drv.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> index c86a3f54f35b..b281482ab8c8 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> @@ -1112,6 +1112,9 @@ static int mtk_drm_probe(struct platform_device *pdev)
>                                                             PLATFORM_DEVID_AUTO,
>                                                             (void *)private->mmsys_dev,
>                                                             sizeof(*private->mmsys_dev));
> +               if (IS_ERR(ovl_adaptor))
> +                       return PTR_ERR(ovl_adaptor);
> +
>                 private->ddp_comp[DDP_COMPONENT_DRM_OVL_ADAPTOR].dev = &ovl_adaptor->dev;
>                 mtk_ddp_comp_init(dev, NULL, &private->ddp_comp[DDP_COMPONENT_DRM_OVL_ADAPTOR],
>                                   DDP_COMPONENT_DRM_OVL_ADAPTOR);
> --
> 2.25.1
>