Skip to content

Commit 3c02a6d

Browse files
tiwaitorvalds
authored andcommitted
Revert "ALSA: usb-audio: Fix potential zero-division at parsing FU"
The commit 8428a8e ("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 <[email protected]> Fixes: 8428a8e ("ALSA: usb-audio: Fix potential zero-division at parsing FU" Signed-off-by: Takashi Iwai <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 8f5abe8 commit 3c02a6d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

sound/usb/mixer.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1476,9 +1476,9 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid,
14761476
return -EINVAL;
14771477
}
14781478
csize = hdr->bControlSize;
1479-
if (csize <= 1) {
1479+
if (!csize) {
14801480
usb_audio_dbg(state->chip,
1481-
"unit %u: invalid bControlSize <= 1\n",
1481+
"unit %u: invalid bControlSize == 0\n",
14821482
unitid);
14831483
return -EINVAL;
14841484
}

0 commit comments

Comments
 (0)