leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: control: Warn if too long string is passed to snd_ctl_enum_info()

Browse Source 
This allows us to catch the bugs in drivers easily.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2014-10-20 18:07:21 +02:00
parent be93709cb1
commit df803e1389
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sound/core/control.c
View File

@ -1747,6 +1747,9 @@ int snd_ctl_enum_info(struct snd_ctl_elem_info *info, unsigned int channels,
info->value.enumerated.items = items; info->value.enumerated.items = items;
if (info->value.enumerated.item >= items) if (info->value.enumerated.item >= items)
info->value.enumerated.item = items - 1; info->value.enumerated.item = items - 1;
WARN(strlen(names[info->value.enumerated.item]) >= sizeof(info->value.enumerated.name),
"ALSA: too long item name '%s'\n",
names[info->value.enumerated.item]);
strlcpy(info->value.enumerated.name, strlcpy(info->value.enumerated.name,
names[info->value.enumerated.item], names[info->value.enumerated.item],
sizeof(info->value.enumerated.name)); sizeof(info->value.enumerated.name));