diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-22 10:32:25 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-03 11:41:06 -0700 |
| commit | 017a4b549759497c802c12c5982cf06f93806e60 (patch) | |
| tree | 55e9627a7c51f19ae4c1d7a22f4e9162e18b94ee /arch/arm/mm | |
| parent | a0dbac4607ee6d97aba53f0d676acbdd416c1214 (diff) | |
| download | kernel_samsung_smdk4412-017a4b549759497c802c12c5982cf06f93806e60.zip kernel_samsung_smdk4412-017a4b549759497c802c12c5982cf06f93806e60.tar.gz kernel_samsung_smdk4412-017a4b549759497c802c12c5982cf06f93806e60.tar.bz2 | |
ARM: dma-mapping: free allocated page if unable to map
commit d8e89b47e00ee80e920761145144640aac4cf71a upstream.
If the attempt to map a page for DMA fails (eg, because we're out of
mapping space) then we must not hold on to the page we allocated for
DMA - doing so will result in a memory leak.
Reported-by: Bryan Phillippe <bp@darkforest.org>
Tested-by: Bryan Phillippe <bp@darkforest.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/dma-mapping.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 82a093c..f96d2c7 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -322,6 +322,8 @@ __dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, gfp_t gfp, if (addr) *handle = pfn_to_dma(dev, page_to_pfn(page)); + else + __dma_free_buffer(page, size); return addr; } |