The driver may sleep under a spin lock, and the function call path is:
snd_ivtv_pcm_hw_free (acquire the lock by spin_lock_irqsave)
  vfree --> may sleep

To fix it, the "substream->runtime->dma_area" is passed to a temporary
value, and mark it NULL when holding the lock. The memory is freed by
vfree through the temporary value outside the lock holding.

Signed-off-by: Jia-Ju Bai <baijiaju1...@163.com>
---
 drivers/media/pci/ivtv/ivtv-alsa-pcm.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/media/pci/ivtv/ivtv-alsa-pcm.c 
b/drivers/media/pci/ivtv/ivtv-alsa-pcm.c
index 807ead2..a692554 100644
--- a/drivers/media/pci/ivtv/ivtv-alsa-pcm.c
+++ b/drivers/media/pci/ivtv/ivtv-alsa-pcm.c
@@ -262,14 +262,17 @@ static int snd_ivtv_pcm_hw_free(struct snd_pcm_substream 
*substream)
 {
        struct snd_ivtv_card *itvsc = snd_pcm_substream_chip(substream);
        unsigned long flags;
+       unsigned char *dma_area = NULL;
 
        spin_lock_irqsave(&itvsc->slock, flags);
        if (substream->runtime->dma_area) {
                dprintk("freeing pcm capture region\n");
-               vfree(substream->runtime->dma_area);
+               dma_area = substream->runtime->dma_area;
                substream->runtime->dma_area = NULL;
        }
        spin_unlock_irqrestore(&itvsc->slock, flags);
+       if (dma_area)
+               vfree(dma_area);
 
        return 0;
 }
-- 
1.7.9.5


Reply via email to