diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2014-06-11 11:16:51 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-11 15:39:19 -0700 |
| commit | 2f87208efb5d06003d8f49af06e4501e768c8627 (patch) | |
| tree | d6ec328a70edc427562beebf6714ee3c171d5f20 /drivers/net | |
| parent | 8fc908c3c3a362df1bf9b8f999d30e2c4258d3fc (diff) | |
| download | linux-next-2f87208efb5d06003d8f49af06e4501e768c8627.tar.gz | |
drivers: net: davinci_cpdma: double free on error
We recently change the kzalloc() to devm_kzalloc() so freeing "ctlr"
here could lead to a double free.
Fixes: e194312854ed ('drivers: net: davinci_cpdma: Convert kzalloc() to devm_kzalloc().')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/ti/davinci_cpdma.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/ti/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c index 539dbdecd310..4a000f6dd6fc 100644 --- a/drivers/net/ethernet/ti/davinci_cpdma.c +++ b/drivers/net/ethernet/ti/davinci_cpdma.c @@ -285,10 +285,8 @@ struct cpdma_ctlr *cpdma_ctlr_create(struct cpdma_params *params) ctlr->params.desc_hw_addr, ctlr->params.desc_mem_size, ctlr->params.desc_align); - if (!ctlr->pool) { - kfree(ctlr); + if (!ctlr->pool) return NULL; - } if (WARN_ON(ctlr->num_chan > CPDMA_MAX_CHANNELS)) ctlr->num_chan = CPDMA_MAX_CHANNELS; |