Commit a2b30446 authored by Huai-Yuan Liu's avatar Huai-Yuan Liu Committed by Chen Zhongjin
Browse files

drm/arm/malidp: fix a possible null pointer dereference 

stable inclusion
from stable-v6.6.33
commit 335cc45ef2b81b68be63c698b4f867a530bdf7a5
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9T5PA
CVE: CVE-2024-36014

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



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

[ Upstream commit a1f95aede6285dba6dd036d907196f35ae3a11ea ]

In malidp_mw_connector_reset, new memory is allocated with kzalloc, but
no check is performed. In order to prevent null pointer dereferencing,
ensure that mw_state is checked before calling
__drm_atomic_helper_connector_reset.

Fixes: 8cbc5caf ("drm: mali-dp: Add writeback connector")
Signed-off-by: default avatarHuai-Yuan Liu <qq810974084@gmail.com>
Signed-off-by: default avatarLiviu Dudau <liviu.dudau@arm.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240407063053.5481-1-qq810974084@gmail.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarChen Zhongjin <chenzhongjin@huawei.com>
parent 9f37f01f

drivers/gpu/drm/arm/malidp_mw.c

+4 −1
Original line number Diff line number Diff line
@@ -72,6 +72,9 @@ static void malidp_mw_connector_reset(struct drm_connector *connector) 
		__drm_atomic_helper_connector_destroy_state(connector->state);



	kfree(connector->state);

	connector->state = NULL;



	if (mw_state)

		__drm_atomic_helper_connector_reset(connector, &mw_state->base);

}