diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-03-15 12:09:10 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-03-16 12:42:16 +0100 |
| commit | 0f886ca12765d20124bd06291c82951fd49a33be (patch) | |
| tree | 77a2f29035f4d41e9cd614645baf1534c291cac0 | |
| parent | b62232d429fa8b1dcf5d8503aa5a5397a03e646a (diff) | |
| download | op-kernel-dev-0f886ca12765d20124bd06291c82951fd49a33be.zip op-kernel-dev-0f886ca12765d20124bd06291c82951fd49a33be.tar.gz | |
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>
| -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 5b03296..529c35c 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -180,6 +180,12 @@ static int create_fixed_stream_quirk(struct snd_usb_audio *chip, } alts = &iface->altsetting[fp->altset_idx]; altsd = get_iface_desc(alts); + if (altsd->bNumEndpoints < 1) { + kfree(fp); + kfree(rate_table); + return -EINVAL; + } + fp->protocol = altsd->bInterfaceProtocol; if (fp->datainterval == 0) |
