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|