summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-dapm.c
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2015-07-21 18:11:08 +0200
committerMark Brown <broonie@kernel.org>2015-07-21 18:08:53 +0100
commit480689617510381391b3d906549477b948d9c4bc (patch)
tree75a0cf1d9e9e84d91b57e462a1939d7c4a493df3 /sound/soc/soc-dapm.c
parentb97e26980f6c13afad4c249b60a8dca7f5f86116 (diff)
downloadop-kernel-dev-480689617510381391b3d906549477b948d9c4bc.zip
op-kernel-dev-480689617510381391b3d906549477b948d9c4bc.tar.gz
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>
Diffstat (limited to 'sound/soc/soc-dapm.c')
-rw-r--r--sound/soc/soc-dapm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 24ea692..cb4bc1c 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -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;
OpenPOWER on IntegriCloud