aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-11-21 11:07:43 -0500
committerTakashi Iwai <tiwai@suse.de>2017-11-21 11:50:32 -0500
commit8428a8ebde2db1e988e41a58497a28beb7ce1705 (patch)
tree5bd2f5a3c9d60d7f8166c170a8f2649cb5201ff7
parentf658f17b5e0e339935dca23e77e0f3cad591926b (diff)
ALSA: usb-audio: Fix potential zero-division at parsing FU
parse_audio_feature_unit() contains a code dividing potentially with zero when a malformed FU descriptor is passed. Although there is already a sanity check, it checks only the value zero, hence it can still lead to a zero-division when a value 1 is passed there. Fix it by correcting the sanity check (and the error message thereof). Fixes: 23caaf19b11e ("ALSA: usb-mixer: Add support for Audio Class v2.0") Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/usb/mixer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 61b348383de8..0537c6322990 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -1476,9 +1476,9 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid,
1476 return -EINVAL; 1476 return -EINVAL;
1477 } 1477 }
1478 csize = hdr->bControlSize; 1478 csize = hdr->bControlSize;
1479 if (!csize) { 1479 if (csize <= 1) {
1480 usb_audio_dbg(state->chip, 1480 usb_audio_dbg(state->chip,
1481 "unit %u: invalid bControlSize == 0\n", 1481 "unit %u: invalid bControlSize <= 1\n",
1482 unitid); 1482 unitid);
1483 return -EINVAL; 1483 return -EINVAL;
1484 } 1484 }