From: Andrey Konovalov <andreyknvl@gmail.com>
Date: Sat, 13 Feb 2016 08:08:06 +0000 (+0300)
Subject: ALSA: usb-audio: avoid freeing umidi object twice
X-Git-Tag: v3.16.35~499
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c0fa0936aa173fbecc956d62865a91ef13dad62;p=thirdparty%2Fkernel%2Fstable.git

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>
Cc: Moritz Muehlenhoff <jmm@inutil.org>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---

diff --git a/sound/usb/midi.c b/sound/usb/midi.c
index 70c97cc4574c7..a160a6b110f57 100644
--- a/sound/usb/midi.c
+++ b/sound/usb/midi.c
@@ -2368,7 +2368,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;
 	}