Commit 9f515b68 authored by Jaroslav Kysela's avatar Jaroslav Kysela

ALSA: emu10k1 - fix possible memory leak in memory allocation routines

The leak was introduced in "[ALSA] emu10k1 - simplify page allocation
for synth" commit.
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 6719292a
...@@ -464,11 +464,17 @@ static int synth_alloc_pages(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk ...@@ -464,11 +464,17 @@ static int synth_alloc_pages(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk
/* first try to allocate from <4GB zone */ /* first try to allocate from <4GB zone */
struct page *p = alloc_page(GFP_KERNEL | GFP_DMA32 | struct page *p = alloc_page(GFP_KERNEL | GFP_DMA32 |
__GFP_NOWARN); __GFP_NOWARN);
if (!p || (page_to_pfn(p) & ~(emu->dma_mask >> PAGE_SHIFT))) if (!p || (page_to_pfn(p) & ~(emu->dma_mask >> PAGE_SHIFT))) {
/* try to allocate from <16MB zone */ /* try to allocate from <16MB zone */
p = alloc_page(GFP_ATOMIC | GFP_DMA | struct page *p1 =
alloc_page(GFP_ATOMIC | GFP_DMA |
__GFP_NORETRY | /* no OOM-killer */ __GFP_NORETRY | /* no OOM-killer */
__GFP_NOWARN); __GFP_NOWARN);
/* free page outside dma_mask range */
if (p)
free_page((unsigned long)page_address(p));
p = p1;
}
if (!p) { if (!p) {
__synth_free_pages(emu, first_page, page - 1); __synth_free_pages(emu, first_page, page - 1);
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment