diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-03-15 12:09:10 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-12 09:12:42 -0700 |
| commit | 7963d34edc58f8e40c0891262cac6e443346313f (patch) | |
| tree | f93318624df0bc40da0d333a8800f54c8010b1c1 /sound | |
| parent | 5c91a520b0d6d2700c96d3b8198d7e3cfddce538 (diff) | |
| download | lwn-7963d34edc58f8e40c0891262cac6e443346313f.tar.gz lwn-7963d34edc58f8e40c0891262cac6e443346313f.zip | |
ALSA: usb-audio: Fix NULL dereference in create_fixed_stream_quirk()
commit 0f886ca12765d20124bd06291c82951fd49a33be upstream.
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
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 9a599b1bc6ba..b7eac2c9c4f7 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -168,6 +168,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) |