| Message ID | YHaEn8h5JP9CGMee@mwanda (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] drm/amdgpu: fix an error code in init_pmu_entry_by_type_and_add() | expand |
On Wed, Apr 14, 2021 at 1:59 AM Dan Carpenter <dan.carpenter@oracle.com> wrote: > > 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> Applied. Thanks! Alex > --- > v2: I sent this patch in Feb but I accidentally added an unrelated > hunk from nouveau to the commit. Now both hunks are have been sent to > the correct lists. > > 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 > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
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);
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> --- v2: I sent this patch in Feb but I accidentally added an unrelated hunk from nouveau to the commit. Now both hunks are have been sent to the correct lists. drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)