lkml.org 
[lkml]   [2012]   [Nov]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] mm: fix NULL checking in dma_pool_create()
    Date
    First, `dev' is dereferenced in dev_to_node(dev), suggesting that it
    must be non-null. Later `dev' is checked against NULL, suggesting
    the opposite. This patch adds a NULL check before its use.

    Signed-off-by: Xi Wang <xi.wang@gmail.com>
    ---
    mm/dmapool.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/mm/dmapool.c b/mm/dmapool.c
    index c5ab33b..afbf88e 100644
    --- a/mm/dmapool.c
    +++ b/mm/dmapool.c
    @@ -135,6 +135,7 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev,
    {
    struct dma_pool *retval;
    size_t allocation;
    + int node;

    if (align == 0) {
    align = 1;
    @@ -159,7 +160,9 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev,
    return NULL;
    }

    - retval = kmalloc_node(sizeof(*retval), GFP_KERNEL, dev_to_node(dev));
    + node = dev ? dev_to_node(dev) : -1;
    +
    + retval = kmalloc_node(sizeof(*retval), GFP_KERNEL, node);
    if (!retval)
    return retval;

    --
    1.7.10.4


    \
     
     \ /
      Last update: 2012-11-05 08:23    [W:4.134 / U:0.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site