ALSA: memalloc: Free the new pages when WC DMA mapping fails
PATCH 1/1 ALSA: memalloc: Free the new pages when WC DMA mapping fails
snd_dma_wc_alloc() keeps the newly allocated pages in a local variable, and snd_dma_alloc_dir_pages() stores them in dmab->area only after ->alloc() returns. If dma_map_single() fails, the error path passes dmab->area to do_free_pages() instead, and that is still NULL at this point for the usual callers.
The pages are then leaked with their write-combining attribute still set, set_memory_wb() warns about the zero address, and for buffers larger than a page free_pages_exact() goes on to free the struct pages of the bogus addresses 4096, 8192 and so on. With CONFIG_DEBUG_VM that hits the VM_BUG_ON() in free_pages():
kernel BUG at mm/page_alloc.c:5600!
RIP: 0010:free_pages_exact+0xcb/0xd0 Call Trace: snd_dma_wc_alloc+0x14f/0x160 [snd_pcm] snd_dma_alloc_dir_pages+0x4f/0x80 [snd_pcm]
This was reproduced on an x86 guest without swiotlb by allocating SNDRV_DMA_TYPE_DEV_WC buffers for a device with a 24-bit streaming DMA mask, so that dma_map_single() fails.
Free the pages that were just allocated.
--- sound/core/memalloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/core/memalloc.c +1 -1
@@ -506,7 +506,7 @@ static void *snd_dma_wc_alloc(struct snd_dma_buffer *dmab, size_t size)return NULL ; dmab->addr =dma_map_single (dmab->dev.dev, p, size,DMA_BIDIRECTIONAL );if (dma_mapping_error (dmab->dev.dev, dmab->addr)) { -do_free_pages (dmab->area, size, true); +do_free_pages (p, size, true);return NULL ; }return p;
Signature · 1 line
2.53.0
Quoted 19 lines · Sasha Levin
snd_dma_wc_alloc()keeps the newly allocated pages in a local variable, andsnd_dma_alloc_dir_pages()stores them indmab->areaonly after ->alloc() returns. Ifdma_map_single()fails, the error path passesdmab->areatodo_free_pages()instead, and that is still NULL at this point for the usual callers.The pages are then leaked with their write-combining attribute still set,
set_memory_wb()warns about the zero address, and for buffers larger than a pagefree_pages_exact()goes on to free the struct pages of the bogus addresses 4096, 8192 and so on. WithCONFIG_DEBUG_VMthat hits theVM_BUG_ON()infree_pages():kernel BUG at
mm/page_alloc.c:5600!RIP: 0010:free_pages_exact+0xcb/0xd0 Call Trace: snd_dma_wc_alloc+0x14f/0x160 [snd_pcm] snd_dma_alloc_dir_pages+0x4f/0x80 [snd_pcm]
Quoted 8 lines
This was reproduced on an x86 guest without swiotlb by allocating
SNDRV_DMA_TYPE_DEV_WCbuffers for a device with a 24-bit streaming DMA mask, so thatdma_map_single()fails.Free the pages that were just allocated.
Fixes c880a5146642 ("ALSA: memalloc: Use proper DMA mapping API for x86 WC buffer allocations")Signed-off-by Sasha Levin <[email protected]>
Applied now. Thanks.
Takashi