]> git.baikalelectronics.ru Git - kernel.git/commit
arm64: add missing PAGE_ALIGN() to __dma_free()
authorDean Nelson <dnelson@redhat.com>
Wed, 29 Apr 2015 15:09:18 +0000 (16:09 +0100)
committerWill Deacon <will.deacon@arm.com>
Wed, 29 Apr 2015 16:39:39 +0000 (17:39 +0100)
commit56b7086b6d13f7ddbf2642a0d475124fb16a58bc
treed661a5897d1c01ba80a980be63332a95dfb7cc61
parentee731b596e573d41122d2605a4c8d121c79b6217
arm64: add missing PAGE_ALIGN() to __dma_free()

__dma_alloc() does a PAGE_ALIGN() on the passed in size argument before
doing anything else. __dma_free() does not. And because it doesn't, it is
possible to leak memory should size not be an integer multiple of PAGE_SIZE.

The solution is to add a PAGE_ALIGN() to __dma_free() like is done in
__dma_alloc().

Additionally, this patch removes a redundant PAGE_ALIGN() from
__dma_alloc_coherent(), since __dma_alloc_coherent() can only be called
from __dma_alloc(), which already does a PAGE_ALIGN() before the call.

Cc: stable@vger.kernel.org
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Dean Nelson <dnelson@redhat.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
arch/arm64/mm/dma-mapping.c