summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Konovalov <andreyknvl@gmail.com>2016-02-13 11:08:06 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-02-19 14:22:39 -0800
commit482c4c1a74eab8c45ece6b353a92d65154b7ea98 (patch)
treec965f79f1b1f418a3b1b6d0bc8daa4da8b50fe4a
parentfc345885783318c63a9860d4476e8cc4257de230 (diff)
downloadlinux-stable-482c4c1a74eab8c45ece6b353a92d65154b7ea98.tar.gz
linux-stable-482c4c1a74eab8c45ece6b353a92d65154b7ea98.tar.bz2
linux-stable-482c4c1a74eab8c45ece6b353a92d65154b7ea98.zip
ALSA: usb-audio: avoid freeing umidi object twice
commit 07d86ca93db7e5cdf4743564d98292042ec21af7 upstream. The 'umidi' object will be free'd on the error path by snd_usbmidi_free() when tearing down the rawmidi interface. So we shouldn't try to free it in snd_usbmidi_create() after having registered the rawmidi interface. Found by KASAN. Signed-off-by: Andrey Konovalov <andreyknvl@gmail.com> Acked-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--sound/usb/midi.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/usb/midi.c b/sound/usb/midi.c
index dabbe05d17f5..37ecba340876 100644
--- a/sound/usb/midi.c
+++ b/sound/usb/midi.c
@@ -2291,7 +2291,6 @@ int snd_usbmidi_create(struct snd_card *card,
else
err = snd_usbmidi_create_endpoints(umidi, endpoints);
if (err < 0) {
- snd_usbmidi_free(umidi);
return err;
}