diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-03-11 20:12:49 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-03-12 09:36:38 +0300 |
| commit | be3bb8236db2d0fcd705062ae2e2a9d75131222f (patch) | |
| tree | 844ead97a7f2fcb4dfcb59e078f19c7a22544dcb | |
| parent | ddb6ca75b5671b8fbf1909bc588c449ee74b34f9 (diff) | |
| download | linux-be3bb8236db2d0fcd705062ae2e2a9d75131222f.tar.xz | |
ALSA: control: Add sanity checks for user ctl id name string
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>
| -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 35324a8e83c8..eeb691d1911f 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -1170,6 +1170,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| |