aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2014-06-11 04:16:51 -0400
committerDavid S. Miller <davem@davemloft.net>2014-06-11 18:39:19 -0400
commit2f87208efb5d06003d8f49af06e4501e768c8627 (patch)
treed6ec328a70edc427562beebf6714ee3c171d5f20
parent8fc908c3c3a362df1bf9b8f999d30e2c4258d3fc (diff)
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>
-rw-r--r--drivers/net/ethernet/ti/davinci_cpdma.c4
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)
285 ctlr->params.desc_hw_addr, 285 ctlr->params.desc_hw_addr,
286 ctlr->params.desc_mem_size, 286 ctlr->params.desc_mem_size,
287 ctlr->params.desc_align); 287 ctlr->params.desc_align);
288 if (!ctlr->pool) { 288 if (!ctlr->pool)
289 kfree(ctlr);
290 return NULL; 289 return NULL;
291 }
292 290
293 if (WARN_ON(ctlr->num_chan > CPDMA_MAX_CHANNELS)) 291 if (WARN_ON(ctlr->num_chan > CPDMA_MAX_CHANNELS))
294 ctlr->num_chan = CPDMA_MAX_CHANNELS; 292 ctlr->num_chan = CPDMA_MAX_CHANNELS;