Commit 844e350d authored Oct 09, 2024 by Jesse Zhang Committed by Liu Chuang Oct 09, 2024

drm/amdgpu: the warning dereferencing obj for nbio_v7_4

stable inclusion
from stable-v6.6.50
commit 7d265772e44d403071a2b573eac0db60250b1c21
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAU9OS
CVE: CVE-2024-46819

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



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

[ Upstream commit d190b459b2a4304307c3468ed97477b808381011 ]

if ras_manager obj null, don't print NBIO err data

Signed-off-by: Jesse Zhang <Jesse.Zhang@amd.com>
Suggested-by: Tim Huang <Tim.Huang@amd.com>
Reviewed-by: Tim Huang <Tim.Huang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Liu Chuang <liuchuang40@huawei.com>

parent fb512ada

drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -384,7 +384,7 @@ static void nbio_v7_4_handle_ras_controller_intr_no_bifring(struct amdgpu_device
		else
		WREG32_SOC15(NBIO, 0, mmBIF_DOORBELL_INT_CNTL, bif_doorbell_intr_cntl);

		if (!ras->disable_ras_err_cnt_harvest) {
		if (ras && !ras->disable_ras_err_cnt_harvest && obj) {
		/*
		* clear error status after ras_controller_intr
		* according to hw team and count ue number