p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "ALSA: usb-audio: Fix potential zero-division at parsing FU" 

The commit 8428a8ebde ("ALSA: usb-audio: Fix potential zero-division
at parsing FU") is utterly bogus and breaks the case with csize=1
instead of fixing anything.  Just take it back again.

Reported-by: Jörg Otte <jrg.otte@gmail.com>
Fixes: 8428a8ebde ("ALSA: usb-audio: Fix potential zero-division at parsing FU"
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Takashi Iwai 2017-11-27 10:59:40 +01:00 committed by Linus Torvalds
parent 8f5abe842e
commit 3c02a6d946
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/usb/mixer.c
View File

@ -1476,9 +1476,9 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid,
return -EINVAL;
}
csize = hdr->bControlSize;
if (csize <= 1) {
if (!csize) {
usb_audio_dbg(state->chip,
"unit %u: invalid bControlSize <= 1\n",
"unit %u: invalid bControlSize == 0\n",
unitid);
return -EINVAL;
}