diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-01-18 14:12:40 +0100 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-01-27 09:56:29 +0100 |
| commit | 5254c684be63fb23d8eb25b05f05ddefcd73b43c (patch) | |
| tree | 93ca6f933b3841931d09dd120161d65ab457aa23 /sound | |
| parent | 30e269d8d1af5ab11e613eab94af33693e95ade6 (diff) | |
ALSA: control: Avoid kernel warnings from tlv ioctl with numid 0
commit c0bcdbdff3ff73a54161fca3cb8b6cdbd0bb8762 upstream.
When a TLV ioctl with numid zero is handled, the driver may spew a
kernel warning with a stack trace at each call. The check was
intended obviously only for a kernel driver, but not for a user
interaction. Let's fix it.
This was spotted by syzkaller fuzzer.
Reported-by: Dmitry Vyukov <dvyukov@google.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/core/control.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/core/control.c b/sound/core/control.c index f2082a35b890..3fcead61f0ef 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -1325,6 +1325,8 @@ static int snd_ctl_tlv_ioctl(struct snd_ctl_file *file, return -EFAULT; if (tlv.length < sizeof(unsigned int) * 2) return -EINVAL; + if (!tlv.numid) + return -EINVAL; down_read(&card->controls_rwsem); kctl = snd_ctl_find_numid(card, tlv.numid); if (kctl == NULL) { |