lkml.org 
[lkml]   [2014]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 180/198] DMA, CMA: fix possible memory leak
    Date
    3.13.11.5 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Joonsoo Kim <iamjoonsoo.kim@lge.com>

    commit fe8eea4f4a3f299ef83ed090d5354698ebe4fda8 upstream.

    We should free memory for bitmap when we find zone mismatch, otherwise
    this memory will leak.

    Additionally, I copy code comment from PPC KVM's CMA code to inform why
    we need to check zone mis-match.

    Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
    Acked-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
    Reviewed-by: Michal Nazarewicz <mina86@mina86.com>
    Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
    Acked-by: Minchan Kim <minchan@kernel.org>
    Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
    Cc: Marek Szyprowski <m.szyprowski@samsung.com>
    Cc: Michal Nazarewicz <mina86@mina86.com>
    Cc: Paolo Bonzini <pbonzini@redhat.com>
    Cc: Gleb Natapov <gleb@kernel.org>
    Cc: Alexander Graf <agraf@suse.de>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: Paul Mackerras <paulus@samba.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/base/dma-contiguous.c | 12 +++++++++++-
    1 file changed, 11 insertions(+), 1 deletion(-)

    diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c
    index 165c2c2..d3bffa4 100644
    --- a/drivers/base/dma-contiguous.c
    +++ b/drivers/base/dma-contiguous.c
    @@ -155,13 +155,23 @@ static int __init cma_activate_area(struct cma *cma)
    base_pfn = pfn;
    for (j = pageblock_nr_pages; j; --j, pfn++) {
    WARN_ON_ONCE(!pfn_valid(pfn));
    + /*
    + * alloc_contig_range requires the pfn range
    + * specified to be in the same zone. Make this
    + * simple by forcing the entire CMA resv range
    + * to be in the same zone.
    + */
    if (page_zone(pfn_to_page(pfn)) != zone)
    - return -EINVAL;
    + goto err;
    }
    init_cma_reserved_pageblock(pfn_to_page(base_pfn));
    } while (--i);

    return 0;
    +
    +err:
    + kfree(cma->bitmap);
    + return -EINVAL;
    }

    static struct cma cma_areas[MAX_CMA_AREAS];
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-07-19 21:21    [W:4.046 / U:0.444 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site