diff options
author | Andrey Konovalov <andreyknvl@gmail.com> | 2016-02-13 11:08:06 +0300 |
---|---|---|
committer | Sasha Levin <sasha.levin@oracle.com> | 2016-03-04 10:18:41 -0500 |
commit | b4dc014d417de972afd85248c8027380f1166317 (patch) | |
tree | 9ce2c87ede731b6fa542eb9464705ea345e624a1 | |
parent | 6702fc0c98d40442f9e74e10c499d68cd96455df (diff) | |
download | lwn-b4dc014d417de972afd85248c8027380f1166317.tar.gz lwn-b4dc014d417de972afd85248c8027380f1166317.zip |
ALSA: usb-audio: avoid freeing umidi object twice
[ 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>
-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 5bfb695547f8..92ae88bdff7e 100644 --- a/sound/usb/midi.c +++ b/sound/usb/midi.c @@ -2406,7 +2406,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; } |