Commit 3a72cf75 authored by Takashi Iwai's avatar Takashi Iwai Committed by Greg Kroah-Hartman

ALSA: hda - Fix the max length of control name in generic parser

commit 0c055b34 upstream.

add_control_with_pfx() in hda_generic.c assumes a shorter name string
for the control element, and this resulted in the truncation of the
long but valid string like "Headphone Surround Switch" in the middle.

This patch aligns the max size to the actual limit of snd_ctl_elem_id,
44.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1f563ec4
...@@ -840,7 +840,7 @@ static int add_control_with_pfx(struct hda_gen_spec *spec, int type, ...@@ -840,7 +840,7 @@ static int add_control_with_pfx(struct hda_gen_spec *spec, int type,
const char *pfx, const char *dir, const char *pfx, const char *dir,
const char *sfx, int cidx, unsigned long val) const char *sfx, int cidx, unsigned long val)
{ {
char name[32]; char name[44];
snprintf(name, sizeof(name), "%s %s %s", pfx, dir, sfx); snprintf(name, sizeof(name), "%s %s %s", pfx, dir, sfx);
if (!add_control(spec, type, name, cidx, val)) if (!add_control(spec, type, name, cidx, val))
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment