diff options
| author | Mark Brown <broonie@kernel.org> | 2015-03-26 17:50:42 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-26 17:50:42 -0700 |
| commit | 1be38e041f8eaa935f370aa0f34dd7a2fe39b1d8 (patch) | |
| tree | 2d89734fc831593784bd411be03a1b9649de4c9d /sound/core/control.c | |
| parent | 6935224da2482a261c786501fbccb1dc4a675225 (diff) | |
| parent | bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 (diff) | |
Merge tag 'v4.0-rc5' into spi-bcm2835
Linux 4.0-rc5
Diffstat (limited to 'sound/core/control.c')
| -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| |