ALSA: seq: Fix leak of pool buffer at concurrent writes

[pandora-kernel.git] / sound / core / seq / seq_memory.c

diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c
index f478f77..e0e683c 100644 (file)
--- a/sound/core/seq/seq_memory.c
+++ b/sound/core/seq/seq_memory.c
@@ -383,17 +383,22 @@ int snd_seq_pool_init(struct snd_seq_pool *pool)
 
        if (snd_BUG_ON(!pool))
                return -EINVAL;
 
        if (snd_BUG_ON(!pool))
                return -EINVAL;

-       if (pool->ptr)                  /* should be atomic? */
-               return 0;

 
 

-       pool->ptr = vmalloc(sizeof(struct snd_seq_event_cell) * pool->size);
-       if (pool->ptr == NULL) {
+       cellptr = vmalloc(sizeof(struct snd_seq_event_cell) * pool->size);
+       if (!cellptr) {

                snd_printd("seq: malloc for sequencer events failed\n");
                return -ENOMEM;
        }
 
        /* add new cells to the free cell list */
        spin_lock_irqsave(&pool->lock, flags);
                snd_printd("seq: malloc for sequencer events failed\n");
                return -ENOMEM;
        }
 
        /* add new cells to the free cell list */
        spin_lock_irqsave(&pool->lock, flags);

+       if (pool->ptr) {
+               spin_unlock_irqrestore(&pool->lock, flags);
+               vfree(cellptr);
+               return 0;
+       }
+
+       pool->ptr = cellptr;

        pool->free = NULL;
 
        for (cell = 0; cell < pool->size; cell++) {
        pool->free = NULL;
 
        for (cell = 0; cell < pool->size; cell++) {