Commit 1c34d824 authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Dave Airlie

drm/ttm: dma: Don't crash on memory in the vmalloc range

dma_alloc_coherent() can return memory in the vmalloc range.
virt_to_page() cannot handle such addresses and crashes. This
patch detects such cases and obtains the struct page * using
vmalloc_to_page() instead.
Signed-off-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
Acked-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 95872b49
...@@ -342,9 +342,12 @@ static struct dma_page *__ttm_dma_alloc_page(struct dma_pool *pool) ...@@ -342,9 +342,12 @@ static struct dma_page *__ttm_dma_alloc_page(struct dma_pool *pool)
d_page->vaddr = dma_alloc_coherent(pool->dev, pool->size, d_page->vaddr = dma_alloc_coherent(pool->dev, pool->size,
&d_page->dma, &d_page->dma,
pool->gfp_flags); pool->gfp_flags);
if (d_page->vaddr) if (d_page->vaddr) {
d_page->p = virt_to_page(d_page->vaddr); if (is_vmalloc_addr(d_page->vaddr))
else { d_page->p = vmalloc_to_page(d_page->vaddr);
else
d_page->p = virt_to_page(d_page->vaddr);
} else {
kfree(d_page); kfree(d_page);
d_page = NULL; d_page = NULL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment