diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-03-15 12:09:10 +0100 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-04-18 08:50:59 -0400 |
| commit | 6ed72ce6ab8b38803b12df8c62a3a52becf19017 (patch) | |
| tree | 16dc718abb3f1fd5b8a9886711c9987ef7e54de0 /sound | |
| parent | 4084f3ab4ddb216046de8e3d8652398e9477c03e (diff) | |
ALSA: usb-audio: Fix NULL dereference in create_fixed_stream_quirk()
[ Upstream commit 0f886ca12765d20124bd06291c82951fd49a33be ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
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 a4d03e5da3e0..47751f08c7a3 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -177,6 +177,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) |