diff options
| author | Kees Cook <keescook@google.com> | 2016-02-13 11:08:06 +0300 |
|---|---|---|
| committer | Kees Cook <keescook@google.com> | 2016-03-04 16:19:37 -0800 |
| commit | 363e46726b0cf6ea5773f685322526a77a8454ed (patch) | |
| tree | a35cd78bf0d6f6b851239c9695dead9b71be28e7 | |
| parent | 8451188d47bb09507a2295b03c59904fbab19e81 (diff) | |
| download | minnowboard-v3.14-363e46726b0cf6ea5773f685322526a77a8454ed.tar.gz | |
UPSTREAM: 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>
Bug: 27300729
(cherry picked from commit 07d86ca93db7e5cdf4743564d98292042ec21af7)
Signed-off-by: Kees Cook <keescook@google.com>
Change-Id: I1513b39a837a76959b61fb3309185067b7e9c49d
| -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 c7aa71ee775..e3d49fa862b 100644 --- a/sound/usb/midi.c +++ b/sound/usb/midi.c @@ -2319,7 +2319,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; } |