p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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: e194312854 ('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>
This commit is contained in:
Dan Carpenter 2014-06-11 11:16:51 +03:00 committed by David S. Miller
parent 8fc908c3c3
commit 2f87208efb
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/ti/davinci_cpdma.c
View File

@ -285,10 +285,8 @@ struct cpdma_ctlr *cpdma_ctlr_create(struct cpdma_params *params)
ctlr->params.desc_hw_addr, ctlr->params.desc_hw_addr,
ctlr->params.desc_mem_size, ctlr->params.desc_mem_size,
ctlr->params.desc_align); ctlr->params.desc_align);
if (!ctlr->pool) { if (!ctlr->pool)
kfree(ctlr);
return NULL; return NULL;
}
if (WARN_ON(ctlr->num_chan > CPDMA_MAX_CHANNELS)) if (WARN_ON(ctlr->num_chan > CPDMA_MAX_CHANNELS))
ctlr->num_chan = CPDMA_MAX_CHANNELS; ctlr->num_chan = CPDMA_MAX_CHANNELS;