Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3867355 authored by Thomas Hellstrom's avatar Thomas Hellstrom
Browse files

drm/ttm: Fix accesses through vmas with only partial coverage 



VMAs covering a bo but that didn't start at the same address space offset as
the bo they were mapping were incorrectly generating SEGFAULT errors in
the fault handler.

Reported-by: default avatarJoseph Dolinak <kanilo2@yahoo.com>
Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: default avatarJakob Bornecrantz <jakob@vmware.com>
Cc: stable@vger.kernel.org
parent 9255ce80

drivers/gpu/drm/ttm/ttm_bo_vm.c

+3 −3
Original line number Diff line number Diff line
@@ -169,9 +169,9 @@ static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
	}



	page_offset = ((address - vma->vm_start) >> PAGE_SHIFT) +

	    drm_vma_node_start(&bo->vma_node) - vma->vm_pgoff;

	page_last = vma_pages(vma) +

	    drm_vma_node_start(&bo->vma_node) - vma->vm_pgoff;

		vma->vm_pgoff - drm_vma_node_start(&bo->vma_node);

	page_last = vma_pages(vma) + vma->vm_pgoff -

		drm_vma_node_start(&bo->vma_node);



	if (unlikely(page_offset >= bo->num_pages)) {

		retval = VM_FAULT_SIGBUS;