Commit 4018651b authored by Dan Carpenter's avatar Dan Carpenter Committed by Chun-Kuang Hu
Browse files

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



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>
parent 3ded11b5

drivers/gpu/drm/mediatek/mtk_crtc.c

+1 −2
Original line number Diff line number Diff line
@@ -127,9 +127,8 @@ static void mtk_crtc_destroy(struct drm_crtc *crtc) 


	mtk_mutex_put(mtk_crtc->mutex);

#if IS_REACHABLE(CONFIG_MTK_CMDQ)

	cmdq_pkt_destroy(&mtk_crtc->cmdq_client, &mtk_crtc->cmdq_handle);



	if (mtk_crtc->cmdq_client.chan) {

		cmdq_pkt_destroy(&mtk_crtc->cmdq_client, &mtk_crtc->cmdq_handle);

		mbox_free_channel(mtk_crtc->cmdq_client.chan);

		mtk_crtc->cmdq_client.chan = NULL;

	}