]> git.hungrycats.org Git - linux/commitdiff
ALSA: usb-audio: avoid freeing umidi object twice
authorAndrey Konovalov <andreyknvl@gmail.com>
Sat, 13 Feb 2016 08:08:06 +0000 (11:08 +0300)
committerSasha Levin <sasha.levin@oracle.com>
Fri, 4 Mar 2016 15:25:43 +0000 (10:25 -0500)
[ Upstream commit 07d86ca93db7e5cdf4743564d98292042ec21af7 ]

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>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
sound/usb/midi.c

index bec63e0d260567ff2cdea320118b62087b7f9e33..f059326a4914d29a46fd2fcb19155019e3dd0d43 100644 (file)
@@ -2451,7 +2451,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;
        }