Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c45e126 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: Remove DAPM debugfs entries before freeing widgets 



Remove the DAPM debugfs entries before freeing the context's widgets, otherwise a
use after free situation might occur.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent d5d1e0be

sound/soc/soc-dapm.c

+10 −0
Original line number Diff line number Diff line
@@ -1292,6 +1292,11 @@ static void dapm_debugfs_add_widget(struct snd_soc_dapm_widget *w) 
			w->name);

}



static void dapm_debugfs_cleanup(struct snd_soc_dapm_context *dapm)

{

	debugfs_remove_recursive(dapm->debugfs_dapm);

}



#else

void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm,

	struct dentry *parent)
@@ -1302,6 +1307,10 @@ static inline void dapm_debugfs_add_widget(struct snd_soc_dapm_widget *w) 
{

}



static inline void dapm_debugfs_cleanup(struct snd_soc_dapm_context *dapm)

{

}



#endif



/* test and update the power status of a mux widget */
@@ -2445,6 +2454,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_ignore_suspend); 
void snd_soc_dapm_free(struct snd_soc_dapm_context *dapm)

{

	snd_soc_dapm_sys_remove(dapm->dev);

	dapm_debugfs_cleanup(dapm);

	dapm_free_widgets(dapm);

	list_del(&dapm->list);

}