ASoC: fix a use after free case
PATCH 1/1 ASoC: fix a use after free case
Unloading ASoC modules as used by the SOF driver leads to an object being used after it's been freed. Fix this be clearing a reference to it and making sure to check for its presence. This fixes issue #144.
Signed-off-by Guennadi Liakhovetski <[email protected]>
--- sound/soc/soc-core.c | 6 +++--- sound/soc/soc-topology.c | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-)
sound/soc/soc-core.c +3 -3
@@ -942,9 +942,9 @@ static void soc_remove_dai(struct snd_soc_dai *dai, int order) {int err; -if (dai && dai->probed && - dai->driver->remove_order == order) { -if (dai->driver->remove) { +if (dai && dai->probed) { +if (dai->driver && dai->driver->remove_order == order && + dai->driver->remove) { err = dai->driver->remove (dai);if (err <0 ) dev_err(dai->dev,
sound/soc/soc-topology.c +5 -0
@@ -502,6 +502,7 @@ static void remove_dai(struct snd_soc_component *comp, {struct snd_soc_dai_driver *dai_drv = container_of(dobj, struct snd_soc_dai_driver, dobj); +struct snd_soc_dai *dai;if (pass !=SOC_TPLG_PASS_PCM_DAI )return ;
@@ -509,6 +510,10 @@ static void remove_dai(struct snd_soc_component *comp,if (dobj->ops && dobj->ops->dai_unload) dobj->ops->dai_unload (comp, dobj); +list_for_each_entry (dai, &comp->dai_list, list) +if (dai->driver == dai_drv) + dai->driver =NULL ; +kfree (dai_drv->name);list_del (&dobj->list);kfree (dai_drv);
Signature · 1 line
2.17.1