Skip to content

Commit

Permalink
drm/shmem-helper: Check for purged buffers in fault handler
Browse files Browse the repository at this point in the history
commit d611b4a upstream.

When a buffer is madvised as not needed and then purged, any attempts to
access the buffer from user-space should cause a bus fault. This patch
adds a check for that.

Cc: stable@vger.kernel.org
Fixes: 17acb9f ("drm/shmem: Add madvise state and purge helpers")
Signed-off-by: Neil Roberts <nroberts@igalia.com>
Reviewed-by: Steven Price <steven.price@arm.com>
Signed-off-by: Steven Price <steven.price@arm.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210223155125.199577-2-nroberts@igalia.com
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
bpeel authored and gregkh committed Mar 17, 2021
1 parent ad106dd commit 368b53e
Showing 1 changed file with 14 additions and 4 deletions.
18 changes: 14 additions & 4 deletions drivers/gpu/drm/drm_gem_shmem_helper.c
Expand Up @@ -534,14 +534,24 @@ static vm_fault_t drm_gem_shmem_fault(struct vm_fault *vmf)
struct drm_gem_object *obj = vma->vm_private_data;
struct drm_gem_shmem_object *shmem = to_drm_gem_shmem_obj(obj);
loff_t num_pages = obj->size >> PAGE_SHIFT;
vm_fault_t ret;
struct page *page;

if (vmf->pgoff >= num_pages || WARN_ON_ONCE(!shmem->pages))
return VM_FAULT_SIGBUS;
mutex_lock(&shmem->pages_lock);

if (vmf->pgoff >= num_pages ||
WARN_ON_ONCE(!shmem->pages) ||
shmem->madv < 0) {
ret = VM_FAULT_SIGBUS;
} else {
page = shmem->pages[vmf->pgoff];

page = shmem->pages[vmf->pgoff];
ret = vmf_insert_page(vma, vmf->address, page);
}

return vmf_insert_page(vma, vmf->address, page);
mutex_unlock(&shmem->pages_lock);

return ret;
}

static void drm_gem_shmem_vm_open(struct vm_area_struct *vma)
Expand Down

0 comments on commit 368b53e

Please sign in to comment.