Commit 48068961 authored Jul 21, 2015 by Lars-Peter Clausen Committed by Mark Brown Jul 21, 2015

ASoC: dapm: Avoid duplicating immutable strings



When creating a new widget from a template the name string of the template
is duplicated for the newly created widget. This is necessary because in
some cases the string might be stored on the stack or other volatile
memory locations.

But most of the time the string is static const data, which means it is
possible to use it directly without having to worry that it might get freed
or changed.

Use kstrdup_const() to handle duplicating the string. This function is
capable of detecting whether a string is immutable and if it is returns the
input without duplicating it. This will slightly reduce the runtime memory
footprint of DAPM and also speed up initialization.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent b97e2698

sound/soc/soc-dapm.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2329,7 +2329,7 @@ void snd_soc_dapm_free_widget(struct snd_soc_dapm_widget *w)
		dapm_free_path(p);

		kfree(w->kcontrols);
		kfree(w->name);
		kfree_const(w->name);
		kfree(w);
		}

		@@ -3350,7 +3350,7 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm,
		if (prefix)
		w->name = kasprintf(GFP_KERNEL, "%s %s", prefix, widget->name);
		else
		w->name = kasprintf(GFP_KERNEL, "%s", widget->name);
		w->name = kstrdup_const(widget->name, GFP_KERNEL);
		if (w->name == NULL) {
		kfree(w);
		return NULL;

Admin message