OSDN Git Service

[media] exynos4-is: Free FIMC-IS CPU memory only when allocated
authorSylwester Nawrocki <s.nawrocki@samsung.com>
Thu, 8 May 2014 17:35:15 +0000 (14:35 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Fri, 23 May 2014 18:50:17 +0000 (15:50 -0300)
Ensure dma_free_coherent() is not called with incorrect arguments
and only when the memory was actually allocated. This will prevent
possible crashes on error paths of the top level media device driver,
when fimc-is device gets unregistered and its driver detached.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: stable@vger.kernel.org # for v3.15
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/platform/exynos4-is/fimc-is.c

index 128b73b..5476dce 100644 (file)
@@ -367,6 +367,9 @@ static void fimc_is_free_cpu_memory(struct fimc_is *is)
 {
        struct device *dev = &is->pdev->dev;
 
+       if (is->memory.vaddr == NULL)
+               return;
+
        dma_free_coherent(dev, is->memory.size, is->memory.vaddr,
                          is->memory.paddr);
 }