diff options
author | Andrey Konovalov <andreyknvl@gmail.com> | 2016-02-13 11:08:06 +0300 |
---|---|---|
committer | Jiri Slaby <jslaby@suse.cz> | 2016-02-15 17:07:51 +0100 |
commit | 563b627dbd698b2ae2f385718f1682ec20a51119 (patch) | |
tree | 64c4da36e53c66f2b7332692f79c0c0a289a7a5f /sound | |
parent | 2d0ca443abc1ec9446df136123d1a63419d7bda8 (diff) | |
download | lwn-563b627dbd698b2ae2f385718f1682ec20a51119.tar.gz lwn-563b627dbd698b2ae2f385718f1682ec20a51119.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: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/usb/midi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/usb/midi.c b/sound/usb/midi.c index 9123fc518f07..424c1e874bd3 100644 --- a/sound/usb/midi.c +++ b/sound/usb/midi.c @@ -2365,7 +2365,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; } |