Commit 1b724494 authored by Amjad Ouled-Ameur's avatar Amjad Ouled-Ameur Committed by Zeng Heng
Browse files

drm/komeda: check for error-valued pointer 

stable inclusion
from stable-v5.10.221
commit bda7cdaeebf57e46c1a488ae7a15f6f264691f59
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IACQYC
CVE: CVE-2024-39505

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



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

[ Upstream commit b880018edd3a577e50366338194dee9b899947e0 ]

komeda_pipeline_get_state() may return an error-valued pointer, thus
check the pointer for negative or null value before dereferencing.

Fixes: 502932a0 ("drm/komeda: Add the initial scaler support for CORE")
Signed-off-by: default avatarAmjad Ouled-Ameur <amjad.ouled-ameur@arm.com>
Signed-off-by: default avatarMaxime Ripard <mripard@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240610102056.40406-1-amjad.ouled-ameur@arm.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZeng Heng <zengheng4@huawei.com>
parent 396c1a6c

drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ komeda_component_get_avail_scaler(struct komeda_component *c, 
	u32 avail_scalers;



	pipe_st = komeda_pipeline_get_state(c->pipeline, state);

	if (!pipe_st)

	if (IS_ERR_OR_NULL(pipe_st))

		return NULL;



	avail_scalers = (pipe_st->active_comps & KOMEDA_PIPELINE_SCALERS) ^