Re: [PATCH v2] drm/amdgpu: handle amdgpu_cgs_create_device() errors in amd_powerplay_create()

From: Alex Deucher
Date: Thu Mar 06 2025 - 09:58:04 EST


Applied. Thanks

On Thu, Mar 6, 2025 at 2:52 AM Wentao Liang <vulab@xxxxxxxxxxx> wrote:
>
> Add error handling to propagate amdgpu_cgs_create_device() failures
> to the caller. When amdgpu_cgs_create_device() fails, release hwmgr
> and return -ENOMEM to prevent null pointer dereference.
>
> [v1]->[v2]: Change error code from -EINVAL to -ENOMEM. Free hwmgr.
>
> Signed-off-by: Wentao Liang <vulab@xxxxxxxxxxx>
> ---
> drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c
> index 26624a716fc6..f8434158a402 100644
> --- a/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c
> +++ b/drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c
> @@ -51,6 +51,11 @@ static int amd_powerplay_create(struct amdgpu_device *adev)
> hwmgr->adev = adev;
> hwmgr->not_vf = !amdgpu_sriov_vf(adev);
> hwmgr->device = amdgpu_cgs_create_device(adev);
> + if (!hwmgr->device) {
> + kfree(hwmgr);
> + return -ENOMEM;
> + }
> +
> mutex_init(&hwmgr->msg_lock);
> hwmgr->chip_family = adev->family;
> hwmgr->chip_id = adev->asic_type;
> --
> 2.42.0.windows.2
>