leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: Baytrail: fix error handling in sst_byt_dsp_init()

Browse Source 
Calling "kfree(byt)" is a double free because that was allocated with
devm_kzalloc().  There were a couple places which leak "byt->msg".  That
memory is allocated in msg_empty_list_init().

Fixes: f7d01fd675 ('ASoC: Intel: Add Intel Baytrail SST DSP IPC support')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Dan Carpenter 2014-03-05 14:11:57 +03:00 committed by Mark Brown
parent a6cf8f7b53
commit 9202c37739
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/soc/intel/sst-baytrail-ipc.c
View File

@ -796,7 +796,7 @@ int sst_byt_dsp_init(struct device *dev, struct sst_pdata *pdata)
err = msg_empty_list_init(byt); err = msg_empty_list_init(byt);
if (err < 0) if (err < 0)
goto list_err; return -ENOMEM;
/* start the IPC message thread */ /* start the IPC message thread */
init_kthread_worker(&byt->kworker); init_kthread_worker(&byt->kworker);
@ -806,7 +806,7 @@ int sst_byt_dsp_init(struct device *dev, struct sst_pdata *pdata)
if (IS_ERR(byt->tx_thread)) { if (IS_ERR(byt->tx_thread)) {
err = PTR_ERR(byt->tx_thread); err = PTR_ERR(byt->tx_thread);
dev_err(byt->dev, "error failed to create message TX task\n"); dev_err(byt->dev, "error failed to create message TX task\n");
goto list_err; goto err_free_msg;
} }
init_kthread_work(&byt->kwork, sst_byt_ipc_tx_msgs); init_kthread_work(&byt->kwork, sst_byt_ipc_tx_msgs);
@ -816,7 +816,7 @@ int sst_byt_dsp_init(struct device *dev, struct sst_pdata *pdata)
byt->dsp = sst_dsp_new(dev, &byt_dev, pdata); byt->dsp = sst_dsp_new(dev, &byt_dev, pdata);
if (byt->dsp == NULL) { if (byt->dsp == NULL) {
err = -ENODEV; err = -ENODEV;
goto list_err; goto err_free_msg;
} }
/* keep the DSP in reset state for base FW loading */ /* keep the DSP in reset state for base FW loading */
@ -848,9 +848,9 @@ boot_err:
sst_fw_free(byt_sst_fw); sst_fw_free(byt_sst_fw);
fw_err: fw_err:
sst_dsp_free(byt->dsp); sst_dsp_free(byt->dsp);
err_free_msg:
kfree(byt->msg); kfree(byt->msg);
list_err:
kfree(byt);
return err; return err;
} }
EXPORT_SYMBOL_GPL(sst_byt_dsp_init); EXPORT_SYMBOL_GPL(sst_byt_dsp_init);