Skip to content

Commit

Permalink
drm/amd/amdgpu: Fix potential ioremap() memory leaks in amdgpu_device…
Browse files Browse the repository at this point in the history
…_init()

[ Upstream commit eb4f139 ]

This ensures that the memory mapped by ioremap for adev->rmmio, is
properly handled in amdgpu_device_init(). If the function exits early
due to an error, the memory is unmapped. If the function completes
successfully, the memory remains mapped.

Reported by smatch:
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c:4337 amdgpu_device_init() warn: 'adev->rmmio' from ioremap() not released on lines: 4035,4045,4051,4058,4068,4337

Cc: Christian König <christian.koenig@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Srinivasan Shanmugam <srinivasan.shanmugam@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
srishanm authored and gregkh committed Apr 13, 2024
1 parent 314e66e commit 58edb8a
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
Expand Up @@ -4025,8 +4025,10 @@ int amdgpu_device_init(struct amdgpu_device *adev,
* early on during init and before calling to RREG32.
*/
adev->reset_domain = amdgpu_reset_create_reset_domain(SINGLE_DEVICE, "amdgpu-reset-dev");
if (!adev->reset_domain)
return -ENOMEM;
if (!adev->reset_domain) {
r = -ENOMEM;
goto unmap_memory;
}

/* detect hw virtualization here */
amdgpu_detect_virtualization(adev);
Expand All @@ -4036,20 +4038,20 @@ int amdgpu_device_init(struct amdgpu_device *adev,
r = amdgpu_device_get_job_timeout_settings(adev);
if (r) {
dev_err(adev->dev, "invalid lockup_timeout parameter syntax\n");
return r;
goto unmap_memory;
}

/* early init functions */
r = amdgpu_device_ip_early_init(adev);
if (r)
return r;
goto unmap_memory;

amdgpu_device_set_mcbp(adev);

/* Get rid of things like offb */
r = drm_aperture_remove_conflicting_pci_framebuffers(adev->pdev, &amdgpu_kms_driver);
if (r)
return r;
goto unmap_memory;

/* Enable TMZ based on IP_VERSION */
amdgpu_gmc_tmz_set(adev);
Expand All @@ -4059,7 +4061,7 @@ int amdgpu_device_init(struct amdgpu_device *adev,
if (adev->gmc.xgmi.supported) {
r = adev->gfxhub.funcs->get_xgmi_info(adev);
if (r)
return r;
goto unmap_memory;
}

/* enable PCIE atomic ops */
Expand Down Expand Up @@ -4328,6 +4330,8 @@ int amdgpu_device_init(struct amdgpu_device *adev,
failed:
amdgpu_vf_error_trans_all(adev);

unmap_memory:
iounmap(adev->rmmio);
return r;
}

Expand Down

0 comments on commit 58edb8a

Please sign in to comment.