]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ALSA: control: Add sanity checks for user ctl id name string
authorTakashi Iwai <tiwai@suse.de>
Wed, 11 Mar 2015 17:12:49 +0000 (18:12 +0100)
committerSasha Levin <sasha.levin@oracle.com>
Sat, 28 Mar 2015 13:49:48 +0000 (09:49 -0400)
[ 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>
sound/core/control.c

index b9611344ff9e53ec351c420411ceb28f2ddb5b8a..82a638a01b24b15dbc14a91d622f7579b51a618f 100644 (file)
@@ -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|