[linux] 01/01: ALSA: usb-audio: avoid freeing umidi object twice (CVE-2016-XXXX)

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch jessie-security
in repository linux.

commit 2c284cf9afc8ed9b6ad3e59d008d9aeb704db860
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Feb 14 04:57:48 2016 +0000

    ALSA: usb-audio: avoid freeing umidi object twice (CVE-2016-XXXX)
---
 debian/changelog                                   |  1 +
 ...sb-audio-avoid-freeing-umidi-object-twice.patch | 29 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8fd6e27..dfba4a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ linux (3.16.7-ckt20-1+deb8u4) UNRELEASED; urgency=medium
     (regression in 3.16.7-ckt20-1+deb8u1)
   * Revert "workqueue: make sure delayed work run in local cpu"
     (regression in 3.16.7-ckt20)
+  * ALSA: usb-audio: avoid freeing umidi object twice (CVE-2016-XXXX)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 23 Jan 2016 22:53:58 +0000
 
diff --git a/debian/patches/bugfix/all/alsa-usb-audio-avoid-freeing-umidi-object-twice.patch b/debian/patches/bugfix/all/alsa-usb-audio-avoid-freeing-umidi-object-twice.patch
new file mode 100644
index 0000000..5c45beb
--- /dev/null
+++ b/debian/patches/bugfix/all/alsa-usb-audio-avoid-freeing-umidi-object-twice.patch
@@ -0,0 +1,29 @@
+From: Andrey Konovalov <andreyknvl at gmail.com>
+Date: Sat, 13 Feb 2016 11:08:06 +0300
+Subject: ALSA: usb-audio: avoid freeing umidi object twice
+Origin: https://git.kernel.org/linus/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 at gmail.com>
+Acked-by: Clemens Ladisch <clemens at ladisch.de>
+Cc: <stable at vger.kernel.org>
+Signed-off-by: Takashi Iwai <tiwai at suse.de>
+---
+ sound/usb/midi.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/sound/usb/midi.c
++++ b/sound/usb/midi.c
+@@ -2322,7 +2322,6 @@ int snd_usbmidi_create(struct snd_card *
+ 	else
+ 		err = snd_usbmidi_create_endpoints(umidi, endpoints);
+ 	if (err < 0) {
+-		snd_usbmidi_free(umidi);
+ 		return err;
+ 	}
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 53fc37e..9c78f07 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -685,3 +685,4 @@ bugfix/x86/x86-mm-Improve-switch_mm-barrier-comments.patch
 bugfix/all/iw_cxgb3-Fix-incorrectly-returning-error-on-success.patch
 bugfix/all/af_unix-guard-against-other-sk-in-unix_dgram_sendmsg.patch
 bugfix/all/revert-workqueue-make-sure-delayed-work-run-in-local-cpu.patch
+bugfix/all/alsa-usb-audio-avoid-freeing-umidi-object-twice.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git