Revision 2cff98b99c469880ce830cbcde015b53b67e0a7b authored by Dean Nelson on 29 April 2015, 15:09:18 UTC, committed by Will Deacon on 29 April 2015, 16:39:39 UTC
__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>
1 parent 6829e27
History
File Mode Size
Kconfig -rw-r--r-- 10.2 KB
Makefile -rw-r--r-- 460 bytes
autosleep.c -rw-r--r-- 2.6 KB
block_io.c -rw-r--r-- 2.4 KB
console.c -rw-r--r-- 3.5 KB
hibernate.c -rw-r--r-- 26.9 KB
main.c -rw-r--r-- 15.2 KB
power.h -rw-r--r-- 8.3 KB
poweroff.c -rw-r--r-- 990 bytes
process.c -rw-r--r-- 5.3 KB
qos.c -rw-r--r-- 19.1 KB
snapshot.c -rw-r--r-- 67.1 KB
suspend.c -rw-r--r-- 13.1 KB
suspend_test.c -rw-r--r-- 5.7 KB
swap.c -rw-r--r-- 35.7 KB
user.c -rw-r--r-- 10.0 KB
wakelock.c -rw-r--r-- 5.5 KB

back to top