From: Christophe Jaillet Date: Fri, 9 Jun 2017 19:27:12 +0000 (+0200) Subject: drm/mediatek: check for memory allocation failure X-Git-Tag: v4.13-rc1~45^2~3^2~1 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4a3bfb5c24306aa129c0de32e5d1ffb553a60a7c;p=karo-tx-linux.git drm/mediatek: check for memory allocation failure If 'devm_kmalloc_array' returns NULL, we should return -ENOMEM as already done a few lines above instead of deferencing a NULL pointer a few lines below. Signed-off-by: Christophe JAILLET Reviewed-by: Matthias Brugger Signed-off-by: CK Hu --- diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c index 6582e1f56d37..cb32c9369f3a 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c @@ -559,6 +559,8 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev, mtk_crtc->ddp_comp = devm_kmalloc_array(dev, mtk_crtc->ddp_comp_nr, sizeof(*mtk_crtc->ddp_comp), GFP_KERNEL); + if (!mtk_crtc->ddp_comp) + return -ENOMEM; mtk_crtc->mutex = mtk_disp_mutex_get(priv->mutex_dev, pipe); if (IS_ERR(mtk_crtc->mutex)) {