* [PATCH] drm/amdgpu: fix an error code in init_pmu_entry_by_type_and_add()
@ 2021-02-16 19:35 ` Dan Carpenter
0 siblings, 0 replies; 6+ messages in thread
From: Dan Carpenter @ 2021-02-16 19:35 UTC (permalink / raw)
To: Alex Deucher
Cc: Christian König, David Airlie, Daniel Vetter, Ben Skeggs,
Harish Kasiviswanathan, Jonathan Kim, Luben Tuikov, amd-gfx,
kernel-janitors
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>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 4 +++-
drivers/gpu/drm/nouveau/nouveau_backlight.c | 1 +
2 files changed, 4 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);
diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
index 72f35a2babcb..3786b1c85182 100644
--- a/drivers/gpu/drm/nouveau/nouveau_backlight.c
+++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
@@ -274,6 +274,7 @@ nouveau_backlight_init(struct drm_connector *connector)
if (!nouveau_get_backlight_name(backlight_name, bl)) {
NV_ERROR(drm, "Failed to retrieve a unique name for the backlight interface\n");
+ ret = -ENOMEM;
goto fail_alloc;
}
--
2.30.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] drm/amdgpu: fix an error code in init_pmu_entry_by_type_and_add()
@ 2021-02-16 19:35 ` Dan Carpenter
0 siblings, 0 replies; 6+ messages in thread
From: Dan Carpenter @ 2021-02-16 19:35 UTC (permalink / raw)
To: Alex Deucher
Cc: Jonathan Kim, David Airlie, kernel-janitors,
Harish Kasiviswanathan, amd-gfx, Luben Tuikov, Ben Skeggs,
Daniel Vetter, Christian König
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>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 4 +++-
drivers/gpu/drm/nouveau/nouveau_backlight.c | 1 +
2 files changed, 4 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);
diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
index 72f35a2babcb..3786b1c85182 100644
--- a/drivers/gpu/drm/nouveau/nouveau_backlight.c
+++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
@@ -274,6 +274,7 @@ nouveau_backlight_init(struct drm_connector *connector)
if (!nouveau_get_backlight_name(backlight_name, bl)) {
NV_ERROR(drm, "Failed to retrieve a unique name for the backlight interface\n");
+ ret = -ENOMEM;
goto fail_alloc;
}
--
2.30.0
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] drm/amdgpu: fix an error code in init_pmu_entry_by_type_and_add()
2021-02-16 19:35 ` Dan Carpenter
@ 2021-02-16 19:52 ` Alex Deucher
-1 siblings, 0 replies; 6+ messages in thread
From: Alex Deucher @ 2021-02-16 19:52 UTC (permalink / raw)
To: Dan Carpenter
Cc: Alex Deucher, Jonathan Kim, David Airlie, kernel-janitors,
Harish Kasiviswanathan, amd-gfx list, Luben Tuikov, Ben Skeggs,
Daniel Vetter, Christian König
On Tue, Feb 16, 2021 at 2:35 PM 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>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 4 +++-
> drivers/gpu/drm/nouveau/nouveau_backlight.c | 1 +
> 2 files changed, 4 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);
> diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
> index 72f35a2babcb..3786b1c85182 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_backlight.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
> @@ -274,6 +274,7 @@ nouveau_backlight_init(struct drm_connector *connector)
>
> if (!nouveau_get_backlight_name(backlight_name, bl)) {
> NV_ERROR(drm, "Failed to retrieve a unique name for the backlight interface\n");
> + ret = -ENOMEM;
> goto fail_alloc;
> }
This hunk looks unrelated?
Alex
>
> --
> 2.30.0
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] drm/amdgpu: fix an error code in init_pmu_entry_by_type_and_add()
@ 2021-02-16 19:52 ` Alex Deucher
0 siblings, 0 replies; 6+ messages in thread
From: Alex Deucher @ 2021-02-16 19:52 UTC (permalink / raw)
To: Dan Carpenter
Cc: Jonathan Kim, David Airlie, kernel-janitors,
Harish Kasiviswanathan, amd-gfx list, Luben Tuikov, Ben Skeggs,
Daniel Vetter, Alex Deucher, Christian König
On Tue, Feb 16, 2021 at 2:35 PM 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>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 4 +++-
> drivers/gpu/drm/nouveau/nouveau_backlight.c | 1 +
> 2 files changed, 4 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);
> diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
> index 72f35a2babcb..3786b1c85182 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_backlight.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
> @@ -274,6 +274,7 @@ nouveau_backlight_init(struct drm_connector *connector)
>
> if (!nouveau_get_backlight_name(backlight_name, bl)) {
> NV_ERROR(drm, "Failed to retrieve a unique name for the backlight interface\n");
> + ret = -ENOMEM;
> goto fail_alloc;
> }
This hunk looks unrelated?
Alex
>
> --
> 2.30.0
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] drm/amdgpu: fix an error code in init_pmu_entry_by_type_and_add()
2021-02-16 19:52 ` Alex Deucher
@ 2021-02-17 11:37 ` Dan Carpenter
-1 siblings, 0 replies; 6+ messages in thread
From: Dan Carpenter @ 2021-02-17 11:37 UTC (permalink / raw)
To: Alex Deucher
Cc: Alex Deucher, Jonathan Kim, David Airlie, kernel-janitors,
Harish Kasiviswanathan, amd-gfx list, Luben Tuikov, Ben Skeggs,
Daniel Vetter, Christian König
On Tue, Feb 16, 2021 at 02:52:55PM -0500, Alex Deucher wrote:
> On Tue, Feb 16, 2021 at 2:35 PM 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>
> > ---
> > drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 4 +++-
> > drivers/gpu/drm/nouveau/nouveau_backlight.c | 1 +
> > 2 files changed, 4 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);
> > diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
> > index 72f35a2babcb..3786b1c85182 100644
> > --- a/drivers/gpu/drm/nouveau/nouveau_backlight.c
> > +++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
> > @@ -274,6 +274,7 @@ nouveau_backlight_init(struct drm_connector *connector)
> >
> > if (!nouveau_get_backlight_name(backlight_name, bl)) {
> > NV_ERROR(drm, "Failed to retrieve a unique name for the backlight interface\n");
> > + ret = -ENOMEM;
> > goto fail_alloc;
> > }
>
> This hunk looks unrelated?
>
That's so weird... I don't even have any clue how that would happen at
all.. Weee wooo weee woooo ALIENS!
Anyway, I'll resend. Thanks!
regards,
dan carpenter
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] drm/amdgpu: fix an error code in init_pmu_entry_by_type_and_add()
@ 2021-02-17 11:37 ` Dan Carpenter
0 siblings, 0 replies; 6+ messages in thread
From: Dan Carpenter @ 2021-02-17 11:37 UTC (permalink / raw)
To: Alex Deucher
Cc: Jonathan Kim, David Airlie, kernel-janitors,
Harish Kasiviswanathan, amd-gfx list, Luben Tuikov, Ben Skeggs,
Daniel Vetter, Alex Deucher, Christian König
On Tue, Feb 16, 2021 at 02:52:55PM -0500, Alex Deucher wrote:
> On Tue, Feb 16, 2021 at 2:35 PM 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>
> > ---
> > drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 4 +++-
> > drivers/gpu/drm/nouveau/nouveau_backlight.c | 1 +
> > 2 files changed, 4 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);
> > diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
> > index 72f35a2babcb..3786b1c85182 100644
> > --- a/drivers/gpu/drm/nouveau/nouveau_backlight.c
> > +++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
> > @@ -274,6 +274,7 @@ nouveau_backlight_init(struct drm_connector *connector)
> >
> > if (!nouveau_get_backlight_name(backlight_name, bl)) {
> > NV_ERROR(drm, "Failed to retrieve a unique name for the backlight interface\n");
> > + ret = -ENOMEM;
> > goto fail_alloc;
> > }
>
> This hunk looks unrelated?
>
That's so weird... I don't even have any clue how that would happen at
all.. Weee wooo weee woooo ALIENS!
Anyway, I'll resend. Thanks!
regards,
dan carpenter
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-02-17 11:41 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-16 19:35 [PATCH] drm/amdgpu: fix an error code in init_pmu_entry_by_type_and_add() Dan Carpenter
2021-02-16 19:35 ` Dan Carpenter
2021-02-16 19:52 ` Alex Deucher
2021-02-16 19:52 ` Alex Deucher
2021-02-17 11:37 ` Dan Carpenter
2021-02-17 11:37 ` Dan Carpenter
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.