linux-kernel - Re: [PATCH v4 1/2] drm/mediatek: fix kernel oops if no crtc is found

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <3a9a9d52-0db9-360e-55f7-78753428ee7f@collabora.com>
Date:   Thu, 21 Sep 2023 12:22:47 +0300
From:   Eugen Hristev <eugen.hristev@...labora.com>
To:     Michael Walle <mwalle@...nel.org>,
        Nícolas F . R . A . Prado 
        <nfraprado@...labora.com>, Chun-Kuang Hu <chunkuang.hu@...nel.org>,
        Philipp Zabel <p.zabel@...gutronix.de>,
        David Airlie <airlied@...il.com>,
        Daniel Vetter <daniel@...ll.ch>,
        Matthias Brugger <matthias.bgg@...il.com>,
        AngeloGioacchino Del Regno 
        <angelogioacchino.delregno@...labora.com>
Cc:     Jitao Shi <jitao.shi@...iatek.com>, linux-kernel@...r.kernel.org,
        dri-devel@...ts.freedesktop.org,
        "Nancy . Lin" <nancy.lin@...iatek.com>,
        linux-mediatek@...ts.infradead.org,
        Stu Hsieh <stu.hsieh@...iatek.com>,
        linux-arm-kernel@...ts.infradead.org
Subject: Re: [PATCH v4 1/2] drm/mediatek: fix kernel oops if no crtc is found

On 9/5/23 11:49, Michael Walle wrote:
> drm_crtc_from_index(0) might return NULL if there are no CRTCs
> registered at all which will lead to a kernel oops in
> mtk_drm_crtc_dma_dev_get(). Add the missing return value check.
> 
> Fixes: 0d9eee9118b7 ("drm/mediatek: Add drm ovl_adaptor sub driver for MT8195")
> Signed-off-by: Michael Walle <mwalle@...nel.org>
> Reviewed-by: Nícolas F. R. A. Prado <nfraprado@...labora.com>
> Tested-by: Nícolas F. R. A. Prado <nfraprado@...labora.com>
> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@...labora.com>

I tried this patch as well, hit the crash during my tests. I also 
reviewed your changes

Tested-by: Eugen Hristev <eugen.hristev@...labora.com>
Reviewed-by: Eugen Hristev <eugen.hristev@...labora.com>

Eugen

> ---
> v4:
>   - collected tags
> v3:
>   - none
> v2:
>   - collected tags
>   - fixed typos
> ---
>   drivers/gpu/drm/mediatek/mtk_drm_drv.c | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> index 93552d76b6e7..2c582498817e 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> @@ -420,6 +420,7 @@ static int mtk_drm_kms_init(struct drm_device *drm)
>   	struct mtk_drm_private *private = drm->dev_private;
>   	struct mtk_drm_private *priv_n;
>   	struct device *dma_dev = NULL;
> +	struct drm_crtc *crtc;
>   	int ret, i, j;
>   
>   	if (drm_firmware_drivers_only())
> @@ -494,7 +495,9 @@ static int mtk_drm_kms_init(struct drm_device *drm)
>   	}
>   
>   	/* Use OVL device for all DMA memory allocations */
> -	dma_dev = mtk_drm_crtc_dma_dev_get(drm_crtc_from_index(drm, 0));
> +	crtc = drm_crtc_from_index(drm, 0);
> +	if (crtc)
> +		dma_dev = mtk_drm_crtc_dma_dev_get(crtc);
>   	if (!dma_dev) {
>   		ret = -ENODEV;
>   		dev_err(drm->dev, "Need at least one OVL device\n");