diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-11-21 17:00:32 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-11-21 17:50:31 +0100 |
| commit | f658f17b5e0e339935dca23e77e0f3cad591926b (patch) | |
| tree | bb2746f2604b3c41bd44c9b0f181ed47d6fc86fa | |
| parent | ALSA: usb-audio: Add sanity checks to FE parser (diff) | |
| download | linux-f658f17b5e0e339935dca23e77e0f3cad591926b.tar.xz linux-f658f17b5e0e339935dca23e77e0f3cad591926b.zip | |
ALSA: usb-audio: Fix potential out-of-bound access at parsing SU
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")
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -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 b8ce651e392c..61b348383de8 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -2098,7 +2098,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; |