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:24 -0800 |
| commit | 730211c79b072dd2a897ce018c2206dcdcecde98 (patch) | |
| tree | 2352232e19317c5d7b7e086ab2c8df1706382445 | |
| parent | 70c68b8d90c19f04ff2ecc751428426e87f25bc8 (diff) | |
| download | v4.1-730211c79b072dd2a897ce018c2206dcdcecde98.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: I15c5b538d66672699e087befc940773d56755b28
| -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 417ebb11cf4..1fa0a78911d 100644 --- a/sound/usb/midi.c +++ b/sound/usb/midi.c @@ -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; } |