From: Jiasheng Jiang <jiasheng@iscas.ac.cn> mainline inclusion from mainline-v5.19-rc1 commit 73c3ed7495c67b8fbdc31cf58e6ca8757df31a33 category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I6698V CVE: CVE-2022-3115 -------------------------------- The return value of kzalloc() needs to be checked. To avoid use of null pointer '&state->base' in case of the failure of alloc. Fixes: 99665d072183 ("drm: mali-dp: add malidp_crtc_state struct") Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn> Reviewed-by: Brian Starkey <brian.starkey@arm.com> Signed-off-by: Liviu Dudau <liviu.dudau@arm.com> Link: https://patchwork.freedesktop.org/patch/msgid/20211214100837.46912-1-jiashen... Conflicts: drivers/gpu/drm/arm/malidp_crtc.c Signed-off-by: ChenXiaoSong <chenxiaosong2@huawei.com> Reviewed-by: Zhang Xiaoxu <zhangxiaoxu5@huawei.com> Reviewed-by: Xiu Jianfeng <xiujianfeng@huawei.com> Signed-off-by: Yongqiang Liu <liuyongqiang13@huawei.com> --- drivers/gpu/drm/arm/malidp_crtc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/arm/malidp_crtc.c b/drivers/gpu/drm/arm/malidp_crtc.c index ef44202fb43f..8d722d2ce20a 100644 --- a/drivers/gpu/drm/arm/malidp_crtc.c +++ b/drivers/gpu/drm/arm/malidp_crtc.c @@ -473,6 +473,8 @@ static void malidp_crtc_reset(struct drm_crtc *crtc) if (state) { crtc->state = &state->base; crtc->state->crtc = crtc; + } else { + crtc->state = NULL; } } -- 2.25.1