dma-debug: use virt_addr_valid() to check linear addresses

Commit Message

Miles Chen Nov. 22, 2017, 3:17 a.m. UTC

From: Miles Chen <[e-mail]>

Coverity found that the commit 3aaabbf1c39e ("lib/dma-debug.c:
fix incorrect pfn calculation") uses incorrect API to check
if a given address is a linear address.
The condition should be: (as discussed in Christoph's review)
if (!is_vmalloc_addr(virt) && !virt_addr_valid(virt))
not
if (!is_vmalloc_addr(virt) && !virt_to_page(virt))

Fix it by using virt_addr_valid() instead of virt_to_page().

Signed-off-by: Miles Chen <[e-mail]>
---
 lib/dma-debug.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Christoph Hellwig Nov. 23, 2017, 8:58 a.m. UTC | #1

Can you just resend the original patch with the fixes?

Miles Chen Nov. 23, 2017, 9:05 a.m. UTC | #2

On Thu, 2017-11-23 at 09:58 +0100, Christoph Hellwig wrote:
> Can you just resend the original patch with the fixes?
> 
No problem. I'll resend the original patch with this fix.

Patch

diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index 1b34d21..4c08eb6 100644
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -1496,7 +1496,7 @@  void debug_dma_alloc_coherent(struct device *dev, size_t size,
 		return;
 
 	/* handle vmalloc and linear addresses */
-	if (!is_vmalloc_addr(virt) && !virt_to_page(virt))
+	if (!is_vmalloc_addr(virt) && !virt_addr_valid(virt))
 		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))