diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-03-15 12:09:10 +0100 |
|---|---|---|
| committer | Simon Shields <keepcalm444@gmail.com> | 2016-11-11 13:26:51 +1100 |
| commit | 264a926b060fb244459a5e9feb0f0a60c3a559f5 (patch) | |
| tree | 80e78b9c3a7e6993fba1631ee7633a9f62b14e98 | |
| parent | 9aead2670a8345f6fe74b63a6350e2136cbe3ff2 (diff) | |
| download | kernel_samsung_smdk4412-264a926b060fb244459a5e9feb0f0a60c3a559f5.zip kernel_samsung_smdk4412-264a926b060fb244459a5e9feb0f0a60c3a559f5.tar.gz kernel_samsung_smdk4412-264a926b060fb244459a5e9feb0f0a60c3a559f5.tar.bz2 | |
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.
Change-Id: I94025f3eec256347b50805b388940774e559dae2
Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=971125
Signed-off-by: Takashi Iwai <tiwai@suse.de>
[bwh: Backported to 3.2:
- There's no altsd variable
- Adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -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 4a650ab..62b955b 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -164,6 +164,12 @@ static int create_fixed_stream_quirk(struct snd_usb_audio *chip, return -EINVAL; } alts = &iface->altsetting[fp->altset_idx]; + if (get_iface_desc(alts)->bNumEndpoints < 1) { + kfree(fp); + kfree(rate_table); + return -EINVAL; + } + fp->datainterval = snd_usb_parse_datainterval(chip, alts); fp->maxpacksize = le16_to_cpu(get_endpoint(alts, 0)->wMaxPacketSize); usb_set_interface(chip->dev, fp->iface, 0); |