* [PATCH] drm/ttm: Fix accesses through vmas with only partial coverage
@ 2013-12-09 7:28 Thomas Hellstrom
2013-12-12 12:22 ` Jakob Bornecrantz
0 siblings, 1 reply; 2+ messages in thread
From: Thomas Hellstrom @ 2013-12-09 7:28 UTC (permalink / raw)
To: jakob, dri-devel; +Cc: Thomas Hellstrom, stable
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 <kanilo2@yahoo.com>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Cc: stable@vger.kernel.org
---
drivers/gpu/drm/ttm/ttm_bo_vm.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c
index b249ab9..6440eea 100644
--- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
@@ -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;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/ttm: Fix accesses through vmas with only partial coverage
2013-12-09 7:28 [PATCH] drm/ttm: Fix accesses through vmas with only partial coverage Thomas Hellstrom
@ 2013-12-12 12:22 ` Jakob Bornecrantz
0 siblings, 0 replies; 2+ messages in thread
From: Jakob Bornecrantz @ 2013-12-12 12:22 UTC (permalink / raw)
To: Thomas Hellstrom; +Cc: dri-devel, stable
Looks good to me.
Cheers, Jakob.
----- Thomas Hellstrom <thellstrom@vmware.com> wrote:
> 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 <kanilo2@yahoo.com>
> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
> Cc: stable@vger.kernel.org
> ---
> drivers/gpu/drm/ttm/ttm_bo_vm.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c
> index b249ab9..6440eea 100644
> --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
> +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
> @@ -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;
> --
> 1.7.10.4
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-12-12 12:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-09 7:28 [PATCH] drm/ttm: Fix accesses through vmas with only partial coverage Thomas Hellstrom
2013-12-12 12:22 ` Jakob Bornecrantz
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.