Merge tag 'dma-mapping-4.16-3' of git://git.infradead.org/users/hch/dma-mapping (b1aad682) · Commits · 戴 / test

Pull dma-mapping fix from Christoph Hellwig: "A single fix for a memory leak regression in the dma-debug code" * tag 'dma-mapping-4.16-3' of git://git.infradead.org/users/hch/dma-mapping: dma-debug: fix memory leak in debug_dma_alloc_coherent

lib/dma-debug.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -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))

Admin message