summaryrefslogtreecommitdiff
path: root/sound/usb/quirks.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-03-15 12:09:10 +0100
committerSasha Levin <sasha.levin@oracle.com>2016-04-18 08:49:33 -0400
commit53b7c0ed67fecfb2123a14b4d1ae246fb2807283 (patch)
treee4b637bef40e546a23e51a14290d9005d2c9371c /sound/usb/quirks.c
parent5cb0beae3394b7c12219ccd234ba4e42f9f38742 (diff)
downloadlwn-53b7c0ed67fecfb2123a14b4d1ae246fb2807283.tar.gz
lwn-53b7c0ed67fecfb2123a14b4d1ae246fb2807283.zip
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/usb/quirks.c')
-rw-r--r--sound/usb/quirks.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 42c1d0171a5a..8f6e08a4d439 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)