Commit 045b8575 authored by Ma Ke's avatar Ma Ke Committed by Jialin Zhang
Browse files

drm/panel: fix a possible null pointer dereference 

stable inclusion
from stable-v5.10.202
commit c7dc0aca5962fb37dbea9769dd26ec37813faae1
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9RFEM
CVE: CVE-2023-52821

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=c7dc0aca5962fb37dbea9769dd26ec37813faae1



--------------------------------

[ Upstream commit 924e5814d1f84e6fa5cb19c6eceb69f066225229 ]

In versatile_panel_get_modes(), the return value of drm_mode_duplicate()
is assigned to mode, which will lead to a NULL pointer dereference
on failure of drm_mode_duplicate(). Add a check to avoid npd.

Signed-off-by: default avatarMa Ke <make_ruc2021@163.com>
Reviewed-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20231007033105.3997998-1-make_ruc2021@163.com


Signed-off-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20231007033105.3997998-1-make_ruc2021@163.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parent 701a14b8

drivers/gpu/drm/panel/panel-arm-versatile.c

+2 −0
Original line number Diff line number Diff line
@@ -267,6 +267,8 @@ static int versatile_panel_get_modes(struct drm_panel *panel, 
	connector->display_info.bus_flags = vpanel->panel_type->bus_flags;



	mode = drm_mode_duplicate(connector->dev, &vpanel->panel_type->mode);

	if (!mode)

		return -ENOMEM;

	drm_mode_set_name(mode);

	mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED;