* [PATCH v1] drm/shmem-helper: Remove another errant put in error path
@ 2023-01-08 21:13 Dmitry Osipenko
2023-01-26 12:36 ` Dmitry Osipenko
2023-02-16 15:35 ` Rob Clark
0 siblings, 2 replies; 4+ messages in thread
From: Dmitry Osipenko @ 2023-01-08 21:13 UTC (permalink / raw)
To: Rob Clark, Thomas Zimmermann, Daniel Vetter, Javier Martinez Canillas
Cc: dri-devel, linux-kernel
drm_gem_shmem_mmap() doesn't own reference in error code path, resulting
in the dma-buf shmem GEM object getting prematurely freed leading to a
later use-after-free.
Fixes: f49a51bfdc8e ("drm/shme-helpers: Fix dma_buf_mmap forwarding bug")
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
---
drivers/gpu/drm/drm_gem_shmem_helper.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
index f21f47737817..8b20b41497e8 100644
--- a/drivers/gpu/drm/drm_gem_shmem_helper.c
+++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
@@ -624,11 +624,14 @@ int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_struct
int ret;
if (obj->import_attach) {
- /* Drop the reference drm_gem_mmap_obj() acquired.*/
- drm_gem_object_put(obj);
vma->vm_private_data = NULL;
+ ret = dma_buf_mmap(obj->dma_buf, vma, 0);
+
+ /* Drop the reference drm_gem_mmap_obj() acquired.*/
+ if (!ret)
+ drm_gem_object_put(obj);
- return dma_buf_mmap(obj->dma_buf, vma, 0);
+ return ret;
}
ret = drm_gem_shmem_get_pages(shmem);
--
2.38.1
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v1] drm/shmem-helper: Remove another errant put in error path
2023-01-08 21:13 [PATCH v1] drm/shmem-helper: Remove another errant put in error path Dmitry Osipenko
@ 2023-01-26 12:36 ` Dmitry Osipenko
2023-02-16 15:35 ` Rob Clark
1 sibling, 0 replies; 4+ messages in thread
From: Dmitry Osipenko @ 2023-01-26 12:36 UTC (permalink / raw)
To: Rob Clark, Thomas Zimmermann, Daniel Vetter, Javier Martinez Canillas
Cc: dri-devel, linux-kernel
On 1/9/23 00:13, Dmitry Osipenko wrote:
> drm_gem_shmem_mmap() doesn't own reference in error code path, resulting
> in the dma-buf shmem GEM object getting prematurely freed leading to a
> later use-after-free.
>
> Fixes: f49a51bfdc8e ("drm/shme-helpers: Fix dma_buf_mmap forwarding bug")
> Cc: stable@vger.kernel.org
> Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
> ---
> drivers/gpu/drm/drm_gem_shmem_helper.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
> index f21f47737817..8b20b41497e8 100644
> --- a/drivers/gpu/drm/drm_gem_shmem_helper.c
> +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
> @@ -624,11 +624,14 @@ int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_struct
> int ret;
>
> if (obj->import_attach) {
> - /* Drop the reference drm_gem_mmap_obj() acquired.*/
> - drm_gem_object_put(obj);
> vma->vm_private_data = NULL;
> + ret = dma_buf_mmap(obj->dma_buf, vma, 0);
> +
> + /* Drop the reference drm_gem_mmap_obj() acquired.*/
> + if (!ret)
> + drm_gem_object_put(obj);
>
> - return dma_buf_mmap(obj->dma_buf, vma, 0);
> + return ret;
> }
>
> ret = drm_gem_shmem_get_pages(shmem);
Rob, is this change still looking good to you? r-b? Thanks!
--
Best regards,
Dmitry
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v1] drm/shmem-helper: Remove another errant put in error path
2023-01-08 21:13 [PATCH v1] drm/shmem-helper: Remove another errant put in error path Dmitry Osipenko
2023-01-26 12:36 ` Dmitry Osipenko
@ 2023-02-16 15:35 ` Rob Clark
2023-02-26 23:51 ` Dmitry Osipenko
1 sibling, 1 reply; 4+ messages in thread
From: Rob Clark @ 2023-02-16 15:35 UTC (permalink / raw)
To: Dmitry Osipenko
Cc: Thomas Zimmermann, Daniel Vetter, Javier Martinez Canillas,
dri-devel, linux-kernel
On Sun, Jan 8, 2023 at 1:13 PM Dmitry Osipenko
<dmitry.osipenko@collabora.com> wrote:
>
> drm_gem_shmem_mmap() doesn't own reference in error code path, resulting
> in the dma-buf shmem GEM object getting prematurely freed leading to a
> later use-after-free.
>
> Fixes: f49a51bfdc8e ("drm/shme-helpers: Fix dma_buf_mmap forwarding bug")
> Cc: stable@vger.kernel.org
> Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
> ---
> drivers/gpu/drm/drm_gem_shmem_helper.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c
> index f21f47737817..8b20b41497e8 100644
> --- a/drivers/gpu/drm/drm_gem_shmem_helper.c
> +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
> @@ -624,11 +624,14 @@ int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_struct
> int ret;
>
> if (obj->import_attach) {
> - /* Drop the reference drm_gem_mmap_obj() acquired.*/
> - drm_gem_object_put(obj);
> vma->vm_private_data = NULL;
> + ret = dma_buf_mmap(obj->dma_buf, vma, 0);
> +
> + /* Drop the reference drm_gem_mmap_obj() acquired.*/
> + if (!ret)
> + drm_gem_object_put(obj);
>
> - return dma_buf_mmap(obj->dma_buf, vma, 0);
> + return ret;
> }
>
> ret = drm_gem_shmem_get_pages(shmem);
> --
> 2.38.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v1] drm/shmem-helper: Remove another errant put in error path
2023-02-16 15:35 ` Rob Clark
@ 2023-02-26 23:51 ` Dmitry Osipenko
0 siblings, 0 replies; 4+ messages in thread
From: Dmitry Osipenko @ 2023-02-26 23:51 UTC (permalink / raw)
To: Rob Clark
Cc: Thomas Zimmermann, Daniel Vetter, Javier Martinez Canillas,
dri-devel, linux-kernel
On 2/16/23 18:35, Rob Clark wrote:
> On Sun, Jan 8, 2023 at 1:13 PM Dmitry Osipenko
> <dmitry.osipenko@collabora.com> wrote:
>>
>> drm_gem_shmem_mmap() doesn't own reference in error code path, resulting
>> in the dma-buf shmem GEM object getting prematurely freed leading to a
>> later use-after-free.
>>
>> Fixes: f49a51bfdc8e ("drm/shme-helpers: Fix dma_buf_mmap forwarding bug")
>> Cc: stable@vger.kernel.org
>> Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
>
> Reviewed-by: Rob Clark <robdclark@gmail.com>
Applied to misc-fixes
--
Best regards,
Dmitry
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-02-26 23:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-08 21:13 [PATCH v1] drm/shmem-helper: Remove another errant put in error path Dmitry Osipenko
2023-01-26 12:36 ` Dmitry Osipenko
2023-02-16 15:35 ` Rob Clark
2023-02-26 23:51 ` Dmitry Osipenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®