OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

codec_adapter: fix panic during reset 

If module_prepare() fails, the pipeline will be reset resulting in
module_reset() getting invoked. Just return if the state is <
MODULE_IDLE which indicates that the module was never prepared.
Also, in this case, local_buff is never allocated. So, check if it is
NULL before zeroing it out to avoid DSP panic.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
This commit is contained in:
Ranjani Sridharan 2022-01-13 19:03:09 -08:00 committed by Liam Girdwood
parent c75d794913
commit 8effa4ff3d
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/audio/codec_adapter/codec/generic.c
View File

@ -307,6 +307,10 @@ int module_reset(struct comp_dev *dev)
struct processing_module *mod = comp_get_drvdata(dev);
struct module_data *md = &mod->priv;
/* if the module was never prepared, no need to reset */
if (md->state < MODULE_IDLE)
return 0;
ret = md->ops->reset(dev);
if (ret) {
comp_err(dev, "module_reset() error %d: module specific reset() failed for comp %d",

5
src/audio/codec_adapter/codec_adapter.c
View File

@ -584,7 +584,10 @@ int codec_adapter_reset(struct comp_dev *dev)
comp_err(dev, "codec_adapter_reset(): error %d, codec reset has failed",
ret);
}
buffer_zero(mod->local_buff);
/* if module is not prepared, local_buffer won't be allocated */
if (mod->local_buff)
buffer_zero(mod->local_buff);
comp_dbg(dev, "codec_adapter_reset(): done");