diff options
| author | Divy Le Ray | 2008-11-27 00:35:59 +0100 |
|---|---|---|
| committer | David S. Miller | 2008-11-27 00:35:59 +0100 |
| commit | 5256554489531f3e177e7308752d8f0681cdd5a6 (patch) | |
| tree | 4ce0f2fe12ef0a9654bc939bd5b015cbfc297647 /drivers/net/cxgb3 | |
| parent | cxgb3: set hard_xmit in the netdev_ops (diff) | |
| download | kernel-qcow2-linux-5256554489531f3e177e7308752d8f0681cdd5a6.tar.gz kernel-qcow2-linux-5256554489531f3e177e7308752d8f0681cdd5a6.tar.xz kernel-qcow2-linux-5256554489531f3e177e7308752d8f0681cdd5a6.zip | |
cxgb3: avoid potential memory leak.
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cxgb3')
| -rw-r--r-- | 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 268f15801ec6..bc6a8dcb8cce 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; } |