diff options
author | Nicolai Krakowiak <nicolai.krakowiak@gmail.com> | 2011-08-04 09:56:27 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-08-04 10:24:06 -0400 |
commit | 60c961a9e1ed879a4d151df6076bf1203f595f73 (patch) | |
tree | 82737b4c558bf9d494c420434cf24ea9ec184fd0 /sound/usb/mixer.c | |
parent | 824818b148db42173446707df4cbd61cd7133272 (diff) |
ALSA: snd-usb: avoid dividing by zero on invalid input
Signed-off-by: Nicolai Krakowiak <nicolai.krakowiak@gmail.com>
Acked-by: Daniel Mack <zonque@gmail.com>
Acked-by: Clemens Ladisch <clemens@ladisch.de>
Cc: stable@kernel.org
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/mixer.c')
-rw-r--r-- | sound/usb/mixer.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index c22fa76e363a..ee9aa087d8b5 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c | |||
@@ -1191,6 +1191,11 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void | |||
1191 | 1191 | ||
1192 | if (state->mixer->protocol == UAC_VERSION_1) { | 1192 | if (state->mixer->protocol == UAC_VERSION_1) { |
1193 | csize = hdr->bControlSize; | 1193 | csize = hdr->bControlSize; |
1194 | if (!csize) { | ||
1195 | snd_printdd(KERN_ERR "usbaudio: unit %u: " | ||
1196 | "invalid bControlSize == 0\n", unitid); | ||
1197 | return -EINVAL; | ||
1198 | } | ||
1194 | channels = (hdr->bLength - 7) / csize - 1; | 1199 | channels = (hdr->bLength - 7) / csize - 1; |
1195 | bmaControls = hdr->bmaControls; | 1200 | bmaControls = hdr->bmaControls; |
1196 | } else { | 1201 | } else { |