Commit c0527b93 authored Mar 11, 2015 by Takashi Iwai Committed by Sasha Levin Mar 28, 2015

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>

parent 095ea4b4

sound/core/control.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -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\|