| Message ID | 20191204210447.11701-4-pierre-louis.bossart@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | dd836ddf4e4e1c7f1eb2ae44783ccd70872ef24e |
| Headers | show |
| Series | ASoC: SOF: fixes for kernel oopses/use-after-free | expand |
Hi > From: Dragos Tarcatu <dragos_tarcatu@mentor.com> > > remove_link() is currently calling snd_soc_remove_dai_link() after > it has already freed the memory for the link name. But this is later > read from snd_soc_get_pcm_runtime() causing a KASAN use-after-free > warning. Reorder the cleanups to fix this issue. > > Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> > Signed-off-by: Dragos Tarcatu <dragos_tarcatu@mentor.com> > Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > --- > sound/soc/soc-topology.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c > index 81d2af000a5c..248530d028a6 100644 > --- a/sound/soc/soc-topology.c > +++ b/sound/soc/soc-topology.c > @@ -548,12 +548,12 @@ static void remove_link(struct snd_soc_component *comp, > if (dobj->ops && dobj->ops->link_unload) > dobj->ops->link_unload(comp, dobj); > > + list_del(&dobj->list); > + snd_soc_remove_dai_link(comp->card, link); > + > kfree(link->name); > kfree(link->stream_name); > kfree(link->cpus->dai_name); > - > - list_del(&dobj->list); > - snd_soc_remove_dai_link(comp->card, link); > kfree(link); > } Yeah, indeed this is needed, I think. Reviewed-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Thank you for your help !! Best regards --- Kuninori Morimoto
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 81d2af000a5c..248530d028a6 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -548,12 +548,12 @@ static void remove_link(struct snd_soc_component *comp, if (dobj->ops && dobj->ops->link_unload) dobj->ops->link_unload(comp, dobj); + list_del(&dobj->list); + snd_soc_remove_dai_link(comp->card, link); + kfree(link->name); kfree(link->stream_name); kfree(link->cpus->dai_name); - - list_del(&dobj->list); - snd_soc_remove_dai_link(comp->card, link); kfree(link); }