mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
35 lines
1023 B
Diff
35 lines
1023 B
Diff
|
From 07d86ca93db7e5cdf4743564d98292042ec21af7 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Andrey Konovalov <andreyknvl@gmail.com>
|
||
|
|
Date: Sat, 13 Feb 2016 11:08:06 +0300
|
||
|
|
Subject: ALSA: usb-audio: avoid freeing umidi object twice
|
||
|
|
|
||
|
|
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>
|
||
|
|
---
|
||
|
|
sound/usb/midi.c | 1 -
|
||
|
|
1 file changed, 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/sound/usb/midi.c b/sound/usb/midi.c
|
||
|
|
index cc39f63..007cf58 100644
|
||
|
|
--- a/sound/usb/midi.c
|
||
|
|
+++ b/sound/usb/midi.c
|
||
|
|
@@ -2455,7 +2455,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;
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
cgit v1.1
|
||
|
|
|