[linux] 02/02: 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 sid
in repository linux.

commit b84086545ea4a1a49d0eab4ef7044837a889b254
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Feb 14 04:55:59 2016 +0000

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

diff --git a/debian/changelog b/debian/changelog
index 845650d..1160aa0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ linux (4.4.1-1) UNRELEASED; urgency=medium
     (regression in 4.4, 4.3.4)
   * bpf: fix branch offset adjustment on backjumps after patching ctx expansion
     (CVE-2016-XXXX)
+  * ALSA: usb-audio: avoid freeing umidi object twice (CVE-2016-XXXX)
 
   [ Roger Shimizu ]
   * Enable TTY_PRINTK as module (Closes: #814540).
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..72c57bf
--- /dev/null
+++ b/debian/patches/bugfix/all/alsa-usb-audio-avoid-freeing-umidi-object-twice.patch
@@ -0,0 +1,31 @@
+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(-)
+
+diff --git a/sound/usb/midi.c b/sound/usb/midi.c
+index cc39f63299ef..007cf5831121 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;
+ 	}
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 9c5fc07..1368076 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -123,3 +123,4 @@ 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/af_unix-don-t-set-err-in-unix_stream_read_generic-unless-there-was-an-error.patch
 bugfix/all/bpf-fix-branch-offset-adjustment-on-backjumps-after-.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