Commit 1547b983 authored by Dan Carpenter's avatar Dan Carpenter Committed by Kaixiong Yu
Browse files

drm/mediatek: Fix potential NULL dereference in mtk_crtc_destroy()

mainline inclusion
from mainline-v6.12-rc6
commit 4018651ba5c409034149f297d3dd3328b91561fd
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IB5KR0
CVE: CVE-2024-53056

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=4018651ba5c409034149f297d3dd3328b91561fd



--------------------------------

In mtk_crtc_create(), if the call to mbox_request_channel() fails then we
set the "mtk_crtc->cmdq_client.chan" pointer to NULL.  In that situation,
we do not call cmdq_pkt_create().

During the cleanup, we need to check if the "mtk_crtc->cmdq_client.chan"
is NULL first before calling cmdq_pkt_destroy().  Calling
cmdq_pkt_destroy() is unnecessary if we didn't call cmdq_pkt_create() and
it will result in a NULL pointer dereference.

Fixes: 7627122f ("drm/mediatek: Add cmdq_handle in mtk_crtc")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: default avatarCK Hu <ck.hu@mediatek.com>
Link: https://patchwork.kernel.org/project/dri-devel/patch/cc537bd6-837f-4c85-a37b-1a007e268310@stanley.mountain/


Signed-off-by: default avatarChun-Kuang Hu <chunkuang.hu@kernel.org>

Conflicts:
	drivers/gpu/drm/mediatek/mtk_crtc.c
	drivers/gpu/drm/mediatek/mtk_drm_crtc.c
[Ma Wupeng: file and function has been renamed, no real changes]
Signed-off-by: default avatarMa Wupeng <mawupeng1@huawei.com>
parent 14c86e20
Loading
Loading
Loading
Loading
+1 −2
Original line number Diff line number Diff line
@@ -163,10 +163,9 @@ static void mtk_drm_crtc_destroy(struct drm_crtc *crtc)

	mtk_mutex_put(mtk_crtc->mutex);
#if IS_REACHABLE(CONFIG_MTK_CMDQ)
	mtk_drm_cmdq_pkt_destroy(&mtk_crtc->cmdq_handle);

	if (mtk_crtc->cmdq_client.chan) {
		mbox_free_channel(mtk_crtc->cmdq_client.chan);
		mtk_drm_cmdq_pkt_destroy(&mtk_crtc->cmdq_handle);
		mtk_crtc->cmdq_client.chan = NULL;
	}
#endif