diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-03-11 18:12:49 +0100 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-03-28 09:49:48 -0400 |
| commit | c0527b93dce28eeb93ac97008511952bca7da762 (patch) | |
| tree | 5fcd983769286c6b1771e63f32b28cc9244f6a94 /sound | |
| parent | 095ea4b422e73946922e511f209b22726013eb96 (diff) | |
ALSA: control: Add sanity checks for user ctl id name string
[ Upstream commit be3bb8236db2d0fcd705062ae2e2a9d75131222f ]
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.
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
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 b9611344ff9e..82a638a01b24 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -1167,6 +1167,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| |