diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-03-11 18:12:49 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-05-09 23:16:29 +0100 |
| commit | 0501b7e487eb6870f46e80275ab4cde3829baeea (patch) | |
| tree | 23d0d22c894a7010d595aa611f0a7bfd549dbc03 /sound | |
| parent | 2269bf3c2fb60c8d6e1511f55e7f1b08e82e252b (diff) | |
| download | kernel_samsung_smdk4412-0501b7e487eb6870f46e80275ab4cde3829baeea.zip kernel_samsung_smdk4412-0501b7e487eb6870f46e80275ab4cde3829baeea.tar.gz kernel_samsung_smdk4412-0501b7e487eb6870f46e80275ab4cde3829baeea.tar.bz2 | |
ALSA: control: Add sanity checks for user ctl id name string
commit be3bb8236db2d0fcd705062ae2e2a9d75131222f upstream.
There was no check about the id string of user control elements, so we
accepted even a control element with an empty string, which is
obviously bogus. This patch adds more sanity checks of id strings.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/core/control.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/core/control.c b/sound/core/control.c index 9210594..1ba5d33 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -1164,6 +1164,10 @@ static int snd_ctl_elem_add(struct snd_ctl_file *file, if (info->count < 1) return -EINVAL; + if (!*info->id.name) + return -EINVAL; + if (strnlen(info->id.name, sizeof(info->id.name)) >= sizeof(info->id.name)) + return -EINVAL; access = info->access == 0 ? SNDRV_CTL_ELEM_ACCESS_READWRITE : (info->access & (SNDRV_CTL_ELEM_ACCESS_READWRITE| SNDRV_CTL_ELEM_ACCESS_INACTIVE| |