From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 15 Mar 2016 11:09:10 +0000 (+0100)
Subject: ALSA: usb-audio: Fix NULL dereference in create_fixed_stream_quirk()
X-Git-Tag: v4.1.12-92~150^2~43
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9422f92e6837418768fd9efcf92b2e269790d0cf;p=users%2Fjedix%2Flinux-maple.git

ALSA: usb-audio: Fix NULL dereference in create_fixed_stream_quirk()

Orabug: 23331116

[ 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>
(cherry picked from commit 6ed72ce6ab8b38803b12df8c62a3a52becf19017)

Signed-off-by: Dan Duval <dan.duval@oracle.com>
---

diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index 00ebc0ca008e..cc55ffbd220d 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)