2022-11-29 20:17:12

by Rob Clark

Subject: [PATCH 1/2] drm/shmem-helper: Remove errant put in error path

From: Rob Clark <[email protected]>

drm_gem_shmem_mmap() doesn't own this reference!

Fixes: 2194a63a818d ("drm: Add library for shmem backed GEM objects")
Cc: [email protected]
Signed-off-by: Rob Clark <[email protected]>
---
drivers/gpu/drm/drm_gem_shmem_helper.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
index 35138f8a375c..110a9eac2af8 100644
--- a/drivers/gpu/drm/drm_gem_shmem_helper.c
+++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
@@ -623,7 +623,6 @@ int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_struct

ret = drm_gem_shmem_get_pages(shmem);
if (ret) {
- drm_gem_vm_close(vma);
return ret;
}

--
2.38.1

2022-11-29 20:32:09

by Guenter Roeck

Subject: Re: [1/2] drm/shmem-helper: Remove errant put in error path

On Tue, Nov 29, 2022 at 12:02:41PM -0800, Rob Clark wrote:
> From: Rob Clark <[email protected]>
>
> drm_gem_shmem_mmap() doesn't own this reference!
>

I think the impact should be explained further.

> Fixes: 2194a63a818d ("drm: Add library for shmem backed GEM objects")
> Cc: [email protected]
> Signed-off-by: Rob Clark <[email protected]>
> ---
> drivers/gpu/drm/drm_gem_shmem_helper.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
> index 35138f8a375c..110a9eac2af8 100644
> --- a/drivers/gpu/drm/drm_gem_shmem_helper.c
> +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
> @@ -623,7 +623,6 @@ int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_struct
>
> ret = drm_gem_shmem_get_pages(shmem);
> if (ret) {
> - drm_gem_vm_close(vma);
> return ret;
> }

Drop the now unnecessary { }

Also, consider adding Reported-by: and possibly Suggested-by:.

Thanks,
Guenter

2022-11-30 11:43:01

by Daniel Vetter

Subject: Re: [PATCH 1/2] drm/shmem-helper: Remove errant put in error path

On Tue, Nov 29, 2022 at 12:02:41PM -0800, Rob Clark wrote:
> From: Rob Clark <[email protected]>
>
> drm_gem_shmem_mmap() doesn't own this reference!
>
> Fixes: 2194a63a818d ("drm: Add library for shmem backed GEM objects")
> Cc: [email protected]
> Signed-off-by: Rob Clark <[email protected]>

With Guenter's nits addressed:

Reviewed-by: Daniel Vetter <[email protected]>


> ---
> drivers/gpu/drm/drm_gem_shmem_helper.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
> index 35138f8a375c..110a9eac2af8 100644
> --- a/drivers/gpu/drm/drm_gem_shmem_helper.c
> +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
> @@ -623,7 +623,6 @@ int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_struct
>
> ret = drm_gem_shmem_get_pages(shmem);
> if (ret) {
> - drm_gem_vm_close(vma);
> return ret;
> }
>
> --
> 2.38.1
>

--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch