drm/shmem-helper: Fix a couple of error path bugs
Subsystems (3)
v2 cover drm/shmem-helper: Fix a couple of error path bugs
From: Rob Clark <[email protected]>
A couple fixes for error paths that userspace could manage to trigger.
Rob Clark (2):
drm/shmem-helper: Remove errant put in error path drm/shmem-helper: Avoid vm_open error paths
drivers/gpu/drm/drm_gem_shmem_helper.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
Signature · 1 line
2.38.1
PATCH v2 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, resulting in the GEM object getting prematurely freed leading to a later use-after-free.
--- drivers/gpu/drm/drm_gem_shmem_helper.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/drm_gem_shmem_helper.c +1 -3
@@ -622,10 +622,8 @@ 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); +if (ret)return ret; - } vma->vm_flags |=VM_PFNMAP |VM_DONTEXPAND |VM_DONTDUMP ; vma->vm_page_prot =vm_get_page_prot (vma->vm_flags);
Signature · 1 line
2.38.1
PATCH v2 2/2 drm/shmem-helper: Avoid vm_open error paths
In reply to Rob ClarkFrom: Rob Clark <[email protected]>
vm_open() is not allowed to fail. Fortunately we are guaranteed that the pages are already pinned, thanks to the initial mmap which is now being cloned into a forked process, and only need to increment the refcnt. So just increment it directly. Previously if a signal was delivered at the wrong time to the forking process, the mutex_lock_interruptible() could fail resulting in the pages_use_count not being incremented.
--- drivers/gpu/drm/drm_gem_shmem_helper.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_gem_shmem_helper.c +11 -3
@@ -571,12 +571,20 @@ static void drm_gem_shmem_vm_open(struct vm_area_struct *vma) {struct drm_gem_object *obj = vma->vm_private_data;struct drm_gem_shmem_object *shmem =to_drm_gem_shmem_obj (obj); -int ret;WARN_ON (shmem->base.import_attach); - ret =drm_gem_shmem_get_pages (shmem); -WARN_ON_ONCE (ret !=0 ); +mutex_lock (&shmem->pages_lock); + +/* +* We should have already pinned the pages when the buffer was first +* mmap'd, vm_open() just grabs an additional reference for the new +* mm the vma is getting copied into (ie. on fork()). +*/ +if (!WARN_ON_ONCE (!shmem->pages_use_count)) + shmem->pages_use_count++; + +mutex_unlock (&shmem->pages_lock);drm_gem_vm_open (vma); }
Signature · 1 line
2.38.1
Re: [PATCH v2 1/2] drm/shmem-helper: Remove errant put in error path
In reply to Rob ClarkQuoted 21 lines · Rob Clark
From: Rob Clark <[email protected]>
drm_gem_shmem_mmap()doesn't own this reference, resulting in the GEM object getting prematurely freed leading to a later use-after-free.Reported-by [email protected]Fixes 2194a63a818d ("drm: Add library for shmem backed GEM objects")Signed-off-by Rob Clark <[email protected]>Reviewed-by Daniel Vetter <[email protected]>--- drivers/gpu/drm/drm_gem_shmem_helper.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)drivers/gpu/drm/drm_gem_shmem_helper.c +0
-0@@ -622,10 +622,8 @@ int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_struct }
drivers/gpu/drm/drm_gem_shmem_helper.c int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_struct · line 629
Quoted 10 lines
drivers/gpu/drm/drm_gem_shmem_helper.c +1
-3ret =drm_gem_shmem_get_pages (shmem); -if (ret) { -drm_gem_vm_close (vma); +if (ret)return ret; - } vma->vm_flags |=VM_PFNMAP |VM_DONTEXPAND |VM_DONTDUMP ; vma->vm_page_prot =vm_get_page_prot (vma->vm_flags);
AFAICS, the dmabuf mmaping code path needs a similar fix, isn't it?
- /* Drop the reference drm_gem_mmap_obj() acquired.*/
- drm_gem_object_put(obj); vma->vm_private_data = NULL;
- return dma_buf_mmap(obj->dma_buf, vma, 0);
+ 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 ret;
Signature · 2 lines
Best regards, Dmitry
Re: [PATCH v2 1/2] drm/shmem-helper: Remove errant put in error path
Quoted 39 lines · Dmitry Osipenko
Quoted 21 lines · Rob Clark
From: Rob Clark <[email protected]>
drm_gem_shmem_mmap()doesn't own this reference, resulting in the GEM object getting prematurely freed leading to a later use-after-free.Reported-by [email protected]Fixes 2194a63a818d ("drm: Add library for shmem backed GEM objects")Signed-off-by Rob Clark <[email protected]>Reviewed-by Daniel Vetter <[email protected]>--- drivers/gpu/drm/drm_gem_shmem_helper.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)drivers/gpu/drm/drm_gem_shmem_helper.c +0
-0@@ -622,10 +622,8 @@ int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_struct }drivers/gpu/drm/drm_gem_shmem_helper.c int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_struct · line 629
Quoted 10 lines
drivers/gpu/drm/drm_gem_shmem_helper.c +1
-3ret =drm_gem_shmem_get_pages (shmem); -if (ret) { -drm_gem_vm_close (vma); +if (ret)return ret; - } vma->vm_flags |=VM_PFNMAP |VM_DONTEXPAND |VM_DONTDUMP ; vma->vm_page_prot =vm_get_page_prot (vma->vm_flags);AFAICS, the dmabuf mmaping code path needs a similar fix, isn't it?
(quoted diff) +0
-2- /* Drop the reference drm_gem_mmap_obj() acquired.*/ - drm_gem_object_put(obj);
Review
Quoted 10 lines
(quoted diff) +7
-1vma->vm_private_data = NULL; - return dma_buf_mmap(obj->dma_buf, vma, 0); + 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 ret;
Yes, it seems that way.. I wish the shmem helpers worked in a less "special" way with regards to refcnting :-(
BR,
-R