[PATCH 2.6.32 51/55] ALSA: usb-audio: avoid freeing umidi object twice

Path	csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Willy Tarreau <w@1wt.eu>
Newsgroups	linux.kernel
Subject	[PATCH 2.6.32 51/55] ALSA: usb-audio: avoid freeing umidi object twice
Date	Fri, 04 Mar 2016 17:20:02 +0100
Message-ID	<r90Cm-R6-15@gated-at.bofh.it> (permalink)
References	<r90sF-Ls-3@gated-at.bofh.it>
User-Agent	quilt/0.63-1
MIME-Version	1.0
Content-Type	text/plain; charset=ISO-8859-15
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	38
Organization	linux.* mail to news gateway
X-Original-Cc	Andrey Konovalov <andreyknvl@gmail.com>, Clemens Ladisch <clemens@ladisch.de>, Takashi Iwai <tiwai@suse.de>, Ben Hutchings <ben@decadent.org.uk>, Willy Tarreau <w@1wt.eu>
X-Original-Date	Fri, 04 Mar 2016 16:30:51 +0100
X-Original-Message-ID	<20160304153002.942432454@1wt.eu>
X-Original-References	<148ee355b419e9976ca727513a1405c8@local>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1350381

Show key headers only | View raw

2.6.32-longterm review patch.  If anyone has any objections, please let me know.

------------------

From: Andrey Konovalov <andreyknvl@gmail.com>

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: Ben Hutchings <ben@decadent.org.uk>
[wt: file is sound/midi/usbmidi.c in 2.6.32]
Signed-off-by: Willy Tarreau <w@1wt.eu>
---
 sound/usb/usbmidi.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c
index 64d8d2e..366020a 100644
--- a/sound/usb/usbmidi.c
+++ b/sound/usb/usbmidi.c
@@ -1947,7 +1947,6 @@ int snd_usb_create_midi_interface(struct snd_usb_audio* chip,
 	else
 		err = snd_usbmidi_create_endpoints(umidi, endpoints);
 	if (err < 0) {
-		snd_usbmidi_free(umidi);
 		return err;
 	}
 
-- 
1.7.12.2.21.g234cd45.dirty

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 2.6.32 51/55] ALSA: usb-audio: avoid freeing umidi object twice Willy Tarreau <w@1wt.eu> - 2016-03-04 17:20 +0100

csiph-web