lkml.org 
[lkml]   [2014]   [Jun]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.15 064/139] media: exynos4-is: Free FIMC-IS CPU memory only when allocated
    Date
    3.15-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Sylwester Nawrocki <s.nawrocki@samsung.com>

    commit 404a90abc60f60df2757cb272660e003d326881f upstream.

    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>
    Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/media/platform/exynos4-is/fimc-is.c | 3 +++
    1 file changed, 3 insertions(+)

    --- a/drivers/media/platform/exynos4-is/fimc-is.c
    +++ b/drivers/media/platform/exynos4-is/fimc-is.c
    @@ -367,6 +367,9 @@ static void fimc_is_free_cpu_memory(stru
    {
    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);
    }



    \
     
     \ /
      Last update: 2014-06-28 21:01    [W:4.093 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site