drm/shmem-helper: Remove another errant put in error path
Subsystems (2)
PATCH 1/1 drm/shmem-helper: Remove another errant put in error path
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.
--- drivers/gpu/drm/drm_gem_shmem_helper.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_gem_shmem_helper.c +6 -3
@@ -624,11 +624,14 @@ int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_structint 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);
Signature · 1 line
2.38.1
Quoted 23 lines · Dmitry Osipenko
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")Signed-off-by Dmitry Osipenko <[email protected]>--- drivers/gpu/drm/drm_gem_shmem_helper.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)drivers/gpu/drm/drm_gem_shmem_helper.c +1
-2@@ -624,11 +624,14 @@ int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_structint 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 );
drivers/gpu/drm/drm_gem_shmem_helper.c int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_struct · line 637
Quoted 10 lines
drivers/gpu/drm/drm_gem_shmem_helper.c +5
-1+ +/* 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!
Signature · 2 lines
Best regards, Dmitry
Quoted 8 lines · Dmitry Osipenko
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")Signed-off-by Dmitry Osipenko <[email protected]>
Quoted 29 lines
--- drivers/gpu/drm/drm_gem_shmem_helper.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)drivers/gpu/drm/drm_gem_shmem_helper.c +6
-4@@ -624,11 +624,14 @@ int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_structint 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
Dmitry Osipenko
AppliedQuoted 7 lines · Rob Clark
Quoted 5 lines · Dmitry Osipenko
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.
Quoted 5 lines
Quoted 3 lines
Fixes f49a51bfdc8e ("drm/shme-helpers: Fix dma_buf_mmap forwarding bug")Signed-off-by Dmitry Osipenko <[email protected]>Reviewed-by Rob Clark <[email protected]>
Applied to misc-fixes
Signature · 2 lines
Best regards, Dmitry