Commit e7adfbdc authored May 15, 2024 by Lu Yao Committed by Baogen Shang May 15, 2024

drm/amdgpu: Fix cat debugfs amdgpu_regs_didt causes kernel null pointer

stable inclusion
from stable-v5.10.209
commit 974f127fcf6552ecd5b76c36c7b107e77b2febf9
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9J6AL
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.10.y&id=974f127fcf6552ecd5b76c36c7b107e77b2febf9



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

[ Upstream commit 2161e09cd05a50d80736fe397145340d2e8f6c05 ]

For 'AMDGPU_FAMILY_SI' family cards, in 'si_common_early_init' func, init
'didt_rreg' and 'didt_wreg' to 'NULL'. But in func
'amdgpu_debugfs_regs_didt_read/write', using 'RREG32_DIDT' 'WREG32_DIDT'
lacks of relevant judgment. And other 'amdgpu_ip_block_version' that use
these two definitions won't be added for 'AMDGPU_FAMILY_SI'.

So, add null pointer judgment before calling.

Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Lu Yao <yaolu@kylinos.cn>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Baogen Shang <baogen.shang@windriver.com>

parent 34c4be6c

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -459,6 +459,9 @@ static ssize_t amdgpu_debugfs_regs_didt_read(struct file f, char __user buf,
		if (size & 0x3 \|\| *pos & 0x3)
		return -EINVAL;

		if (!adev->didt_rreg)
		return -EOPNOTSUPP;

		r = pm_runtime_get_sync(adev_to_drm(adev)->dev);
		if (r < 0) {
		pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);
		@@ -518,6 +521,9 @@ static ssize_t amdgpu_debugfs_regs_didt_write(struct file *f, const char __user
		if (size & 0x3 \|\| *pos & 0x3)
		return -EINVAL;

		if (!adev->didt_wreg)
		return -EOPNOTSUPP;

		r = pm_runtime_get_sync(adev_to_drm(adev)->dev);
		if (r < 0) {
		pm_runtime_put_autosuspend(adev_to_drm(adev)->dev);