Commit c24d2a48 authored by Konrad Dybcio's avatar Konrad Dybcio Committed by Zeng Heng
Browse files

drm/msm/adreno: Assign msm_gpu->pdev earlier to avoid nullptrs 

stable inclusion
from stable-v6.6.55
commit 9288a9676c529ad9c856096db68fad812499bc4a
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IB1MDC
CVE: CVE-2024-49901

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



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

[ Upstream commit 16007768551d5bfe53426645401435ca8d2ef54f ]

There are some cases, such as the one uncovered by Commit 46d4efcccc68
("drm/msm/a6xx: Avoid a nullptr dereference when speedbin setting fails")
where

msm_gpu_cleanup() : platform_set_drvdata(gpu->pdev, NULL);

is called on gpu->pdev == NULL, as the GPU device has not been fully
initialized yet.

Turns out that there's more than just the aforementioned path that
causes this to happen (e.g. the case when there's speedbin data in the
catalog, but opp-supported-hw is missing in DT).

Assigning msm_gpu->pdev earlier seems like the least painful solution
to this, therefore do so.

Signed-off-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Patchwork: https://patchwork.freedesktop.org/patch/602742/


Signed-off-by: default avatarRob Clark <robdclark@chromium.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZeng Heng <zengheng4@huawei.com>
parent bc1376a3

drivers/gpu/drm/msm/adreno/adreno_gpu.c

+1 −0
Original line number Diff line number Diff line
@@ -1071,6 +1071,7 @@ int adreno_gpu_init(struct drm_device *drm, struct platform_device *pdev, 
	adreno_gpu->chip_id = config->chip_id;



	gpu->allow_relocs = config->info->family < ADRENO_6XX_GEN1;

	gpu->pdev = pdev;



	/* Only handle the core clock when GMU is not in use (or is absent). */

	if (adreno_has_gmu_wrapper(adreno_gpu) ||

drivers/gpu/drm/msm/msm_gpu.c

+0 −1
Original line number Diff line number Diff line
@@ -927,7 +927,6 @@ int msm_gpu_init(struct drm_device *drm, struct platform_device *pdev, 
	if (IS_ERR(gpu->gpu_cx))

		gpu->gpu_cx = NULL;



	gpu->pdev = pdev;

	platform_set_drvdata(pdev, &gpu->adreno_smmu);



	msm_devfreq_init(gpu);