diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-11-21 17:00:32 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2018-02-13 18:42:28 +0000 |
| commit | 1ab62280ff7827969ab1188639d8497ac5db7c67 (patch) | |
| tree | a6d68fc7831888e8839c27eef5242e0badd1a785 /sound/usb | |
| parent | 9aeaf942b751cfd9f980caf1e7401ba99b3aa960 (diff) | |
ALSA: usb-audio: Fix potential out-of-bound access at parsing SU
commit f658f17b5e0e339935dca23e77e0f3cad591926b upstream.
The usb-audio driver may trigger an out-of-bound access at parsing a
malformed selector unit, as it checks the header length only after
evaluating bNrInPins field, which can be already above the given
length. Fix it by adding the length check beforehand.
Fixes: 99fc86450c43 ("ALSA: usb-mixer: parse descriptors with structs")
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/mixer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index a211de118763..2784ed187fee 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -2020,7 +2020,8 @@ static int parse_audio_selector_unit(struct mixer_build *state, int unitid, const struct usbmix_name_map *map; char **namelist; - if (!desc->bNrInPins || desc->bLength < 5 + desc->bNrInPins) { + if (desc->bLength < 5 || !desc->bNrInPins || + desc->bLength < 5 + desc->bNrInPins) { usb_audio_err(state->chip, "invalid SELECTOR UNIT descriptor %d\n", unitid); return -EINVAL; |