summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2010-06-21 17:03:21 +0200
committerTakashi Iwai <tiwai@suse.de>2010-06-21 17:07:58 +0200
commit272cbc98cfbdd30cff37a35f8ad8f1b737288e88 (patch)
tree9ac944574d3a98e106a11d362cb69293cacb0d48
parent2a383cb3f1a571b281c2e1ace4c8491f0370e866 (diff)
downloadlinux-3.10-272cbc98cfbdd30cff37a35f8ad8f1b737288e88.tar.gz
linux-3.10-272cbc98cfbdd30cff37a35f8ad8f1b737288e88.tar.bz2
linux-3.10-272cbc98cfbdd30cff37a35f8ad8f1b737288e88.zip
ALSA: usb/endpoint, fix dangling pointer use
Stanse found that in snd_usb_parse_audio_endpoints, there is a dangling pointer dereference. When snd_usb_parse_audio_format fails, fp is freed, and continue invoked. On the next loop, there is "fp && fp->altsetting == 1 && fp->channels == 1" test, but fp is set from the last iteration (but is bogus) and thus ilegally dereferenced. Set fp to NULL before "continue". Signed-off-by: Jiri Slaby <jslaby@suse.cz> Acked-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/usb/endpoint.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c
index 9593b91452b..6f6596cf2b1 100644
--- a/sound/usb/endpoint.c
+++ b/sound/usb/endpoint.c
@@ -427,6 +427,7 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no)
if (snd_usb_parse_audio_format(chip, fp, format, fmt, stream, alts) < 0) {
kfree(fp->rate_table);
kfree(fp);
+ fp = NULL;
continue;
}