lkml.org 
[lkml]   [2008]   [Nov]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/4 2.6.29] cxgb3 - avoid potential memory leak.
    Date
    From: Divy Le Ray <divy@chelsio.com>

    Add consistency in alloc_ring() parameter checking
    to avoid potential memory leaks.
    alloc_ring() callers are correct fo far.

    Signed-off-by: Divy Le Ray <divy@chelsio.com>
    ---

    drivers/net/cxgb3/sge.c | 5 ++---
    1 files changed, 2 insertions(+), 3 deletions(-)

    diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
    index 268f158..bc6a8dc 100644
    --- a/drivers/net/cxgb3/sge.c
    +++ b/drivers/net/cxgb3/sge.c
    @@ -549,16 +549,15 @@ static void *alloc_ring(struct pci_dev *pdev, size_t nelem, size_t elem_size,

    if (!p)
    return NULL;
    - if (sw_size) {
    + if (sw_size && metadata) {
    s = kcalloc(nelem, sw_size, GFP_KERNEL);

    if (!s) {
    dma_free_coherent(&pdev->dev, len, p, *phys);
    return NULL;
    }
    - }
    - if (metadata)
    *(void **)metadata = s;
    + }
    memset(p, 0, len);
    return p;
    }


    \
     
     \ /
      Last update: 2008-11-26 21:41    [W:0.022 / U:29.324 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site