diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-03-11 18:12:49 +0100 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-04-09 13:14:08 +0200 |
| commit | f6b485a40d29c6800e7d3d720acac5201a4a9bc5 (patch) | |
| tree | 0ffaad9b0081eb2d3d65ec4f51f2c751d14f2b7c /sound | |
| parent | 562960330f8e7dc5ab64ab7d38270ae2c34a067a (diff) | |
| download | lwn-f6b485a40d29c6800e7d3d720acac5201a4a9bc5.tar.gz lwn-f6b485a40d29c6800e7d3d720acac5201a4a9bc5.zip | |
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: Jiri Slaby <jslaby@suse.cz>
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 98a29b26c5f4..f2082a35b890 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -1168,6 +1168,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| |