| From 74879f6ddab0a118c0f21587b3472251490b6829 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 14 Apr 2021 08:58:55 +0300 |
| Subject: drm/amdgpu: fix an error code in init_pmu_entry_by_type_and_add() |
| |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| |
| [ Upstream commit 90cb3d8aca1baea9471d28f28d5de1528dd5e424 ] |
| |
| If the kmemdup() fails then this should return a negative error code |
| but it currently returns success |
| |
| Fixes: b4a7db71ea06 ("drm/amdgpu: add per device user friendly xgmi events for vega20") |
| Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c |
| index 19c0a3655228..82e9ecf84352 100644 |
| --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c |
| +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c |
| @@ -519,8 +519,10 @@ static int init_pmu_entry_by_type_and_add(struct amdgpu_pmu_entry *pmu_entry, |
| pmu_entry->pmu.attr_groups = kmemdup(attr_groups, sizeof(attr_groups), |
| GFP_KERNEL); |
| |
| - if (!pmu_entry->pmu.attr_groups) |
| + if (!pmu_entry->pmu.attr_groups) { |
| + ret = -ENOMEM; |
| goto err_attr_group; |
| + } |
| |
| snprintf(pmu_name, PMU_NAME_SIZE, "%s_%d", pmu_entry->pmu_file_prefix, |
| adev_to_drm(pmu_entry->adev)->primary->index); |
| -- |
| 2.30.2 |
| |
