drm/ttm: Fix accesses through vmas with only partial coverage
Subsystems (3)
PATCH 1/1 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 Joseph Dolinak <[email protected]>
Signed-off-by Thomas Hellstrom <[email protected]>
--- drivers/gpu/drm/ttm/ttm_bo_vm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/ttm/ttm_bo_vm.c +3 -3
@@ -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 ;
Signature · 1 line
1.7.10.4
Looks good to me.
Cheers, Jakob.
Quoted 30 lines · ----- Thomas Hellstrom
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 Joseph Dolinak <[email protected]>Signed-off-by Thomas Hellstrom <[email protected]>---
drivers/gpu/drm/ttm/ttm_bo_vm.c| 6 +++---1 file changed, 3 insertions(+), 3 deletions(-)drivers/gpu/drm/ttm/ttm_bo_vm.c +3
-3@@ -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 ;Signature · 1 line
1.7.10.4