Commit af1da686 authored by Miles Chen's avatar Miles Chen Committed by Christoph Hellwig

dma-debug: fix memory leak in debug_dma_alloc_coherent

Marty reported a memory leakage introduced by commit 3aaabbf1
("lib/dma-debug.c: fix incorrect pfn calculation"). Fix it
by checking the virtual address before allocating the entry.

This patch also use virt_addr_valid() instead of virt_to_page()
to check if a virtual address is linear.

Fixes: 3aaabbf1 ("lib/dma-debug.c: fix incorrect pfn calculation")
Reported-by: default avatarMarty Faltesek <mfaltesek@google.com>
Signed-off-by: default avatarMiles Chen <miles.chen@mediatek.com>
Acked-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent a638af00
......@@ -1491,12 +1491,12 @@ void debug_dma_alloc_coherent(struct device *dev, size_t size,
if (unlikely(virt == NULL))
return;
entry = dma_entry_alloc();
if (!entry)
/* handle vmalloc and linear addresses */
if (!is_vmalloc_addr(virt) && !virt_addr_valid(virt))
return;
/* handle vmalloc and linear addresses */
if (!is_vmalloc_addr(virt) && !virt_to_page(virt))
entry = dma_entry_alloc();
if (!entry)
return;
entry->type = dma_debug_coherent;
......@@ -1528,7 +1528,7 @@ void debug_dma_free_coherent(struct device *dev, size_t size,
};
/* handle vmalloc and linear addresses */
if (!is_vmalloc_addr(virt) && !virt_to_page(virt))
if (!is_vmalloc_addr(virt) && !virt_addr_valid(virt))
return;
if (is_vmalloc_addr(virt))
......
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