diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-03-15 12:09:10 +0100 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2016-12-11 13:24:53 +0100 |
| commit | 6b86c401bee216249f70a44cc05bd3dff657bbb1 (patch) | |
| tree | f9487feff73812c0f23fa39ce3e74f554176c90a /sound | |
| parent | 1776a7190214a2baefc033ffc651eca2b4152e5b (diff) | |
ALSA: usb-audio: Fix NULL dereference in create_fixed_stream_quirk()
create_fixed_stream_quirk() may cause a NULL-pointer dereference by
accessing the non-existing endpoint when a USB device with a malformed
USB descriptor is used.
This patch avoids it simply by adding a sanity check of bNumEndpoints
before the accesses.
Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=971125
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/usb/quirks.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 87346fd73..dfd5023b7 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -162,6 +162,12 @@ static int create_fixed_stream_quirk(struct snd_usb_audio *chip, goto error; } alts = &iface->altsetting[fp->altset_idx]; + if (get_iface_desc(alts)->bNumEndpoints < 1) { + kfree(fp); + kfree(rate_table); + return -EINVAL; + } + if (fp->datainterval == 0) fp->datainterval = snd_usb_parse_datainterval(chip, alts); if (fp->maxpacksize == 0) |