Commit fd589a1b authored by Jyri Sarha's avatar Jyri Sarha Committed by Mark Brown
Browse files

ASoC: dapm: Reset dapm wcache after freeing damp widgets 



If there is anything in damp->path_source_cache or
damp->path_sink_cache, it can not be valid after the widgets have been
freed. Without this patch a repeated remove and load of a machine
driver may cause NULL pointer reference in dapm_wcache_lookup() when a
freed widget, not belonging to any list, is haunting in the wcache.

Signed-off-by: default avatarJyri Sarha <jsarha@ti.com>
Reported-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent bb9a13a0

include/sound/soc-dapm.h

+1 −0
Original line number Diff line number Diff line
@@ -398,6 +398,7 @@ int snd_soc_dapm_del_routes(struct snd_soc_dapm_context *dapm, 
int snd_soc_dapm_weak_routes(struct snd_soc_dapm_context *dapm,

			     const struct snd_soc_dapm_route *route, int num);

void snd_soc_dapm_free_widget(struct snd_soc_dapm_widget *w);

void snd_soc_dapm_reset_cache(struct snd_soc_dapm_context *dapm);



/* dapm events */

void snd_soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int stream,

sound/soc/soc-dapm.c

+7 −0
Original line number Diff line number Diff line
@@ -2293,6 +2293,12 @@ void snd_soc_dapm_free_widget(struct snd_soc_dapm_widget *w) 
	kfree(w);

}



void snd_soc_dapm_reset_cache(struct snd_soc_dapm_context *dapm)

{

	dapm->path_sink_cache.widget = NULL;

	dapm->path_source_cache.widget = NULL;

}



/* free all dapm widgets and resources */

static void dapm_free_widgets(struct snd_soc_dapm_context *dapm)

{
@@ -2303,6 +2309,7 @@ static void dapm_free_widgets(struct snd_soc_dapm_context *dapm) 
			continue;

		snd_soc_dapm_free_widget(w);

	}

	snd_soc_dapm_reset_cache(dapm);

}



static struct snd_soc_dapm_widget *dapm_find_widget(

sound/soc/soc-topology.c

+1 −0
Original line number Diff line number Diff line
@@ -1805,6 +1805,7 @@ void snd_soc_tplg_widget_remove_all(struct snd_soc_dapm_context *dapm, 
		snd_soc_tplg_widget_remove(w);

		snd_soc_dapm_free_widget(w);

	}

	snd_soc_dapm_reset_cache(dapm);

}

EXPORT_SYMBOL_GPL(snd_soc_tplg_widget_remove_all);

CRA Git | Maintained and supported by SUSTech CRA and CCSE