]> www.infradead.org Git - users/jedix/linux-maple.git/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)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 10 Mar 2016 20:47:51 +0000 (12:47 -0800)
Orabug: 22740866
CVE: CVE-2016-2384

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>
(cherry picked from commit 07d86ca93db7e5cdf4743564d98292042ec21af7)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
sound/usb/midi.c

index 417ebb11cf4896b8009c0aa86c7dab71c34d61a4..1fa0a78911df97fab7c0eda485c183a0cf19cc6c 100644 (file)
@@ -2405,7 +2405,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;
        }