]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/mediatek: mtk_drm_crtc: Add checks for devm_kcalloc
authorruanjinjie <ruanjinjie@huawei.com>
Mon, 5 Dec 2022 09:51:15 +0000 (17:51 +0800)
committerAndrea Righi <andrea.righi@canonical.com>
Tue, 14 Mar 2023 15:46:43 +0000 (16:46 +0100)
BugLink: https://bugs.launchpad.net/bugs/2011425
[ Upstream commit 5bf1e3bd7da625ccf9a22c8cb7d65271e6e47f4c ]

As the devm_kcalloc may return NULL, the return value needs to be checked
to avoid NULL poineter dereference.

Fixes: 31c5558dae05 ("drm/mediatek: Refactor plane init")
Signed-off-by: ruanjinjie <ruanjinjie@huawei.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://patchwork.kernel.org/project/linux-mediatek/patch/20221205095115.2905090-1-ruanjinjie@huawei.com/
Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
drivers/gpu/drm/mediatek/mtk_drm_crtc.c

index 112615817dcbe9116b94ea195e2f930ed4b1d0b7..5071f1263216b21f693aa69a33e167d3183ba2b5 100644 (file)
@@ -945,6 +945,8 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
 
        mtk_crtc->planes = devm_kcalloc(dev, num_comp_planes,
                                        sizeof(struct drm_plane), GFP_KERNEL);
+       if (!mtk_crtc->planes)
+               return -ENOMEM;
 
        for (i = 0; i < mtk_crtc->ddp_comp_nr; i++) {
                ret = mtk_drm_crtc_init_comp_planes(drm_dev, mtk_crtc, i,