3.18-stable patches

added patches:
	alsa-seq-fix-missing-null-check-at-remove_events-ioctl.patch

diff --git a/queue-3.18/alsa-seq-fix-missing-null-check-at-remove_events-ioctl.patch b/queue-3.18/alsa-seq-fix-missing-null-check-at-remove_events-ioctl.patch
new file mode 100644 (file)
index 0000000..6d25f51
--- /dev/null
+++ b/queue-3.18/alsa-seq-fix-missing-null-check-at-remove_events-ioctl.patch
@@ -0,0 +1,36 @@
+From 030e2c78d3a91dd0d27fef37e91950dde333eba1 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Tue, 12 Jan 2016 12:38:02 +0100
+Subject: ALSA: seq: Fix missing NULL check at remove_events ioctl
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit 030e2c78d3a91dd0d27fef37e91950dde333eba1 upstream.
+
+snd_seq_ioctl_remove_events() calls snd_seq_fifo_clear()
+unconditionally even if there is no FIFO assigned, and this leads to
+an Oops due to NULL dereference.  The fix is just to add a proper NULL
+check.
+
+Reported-by: Dmitry Vyukov <dvyukov@google.com>
+Tested-by: Dmitry Vyukov <dvyukov@google.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Cc: Mark Salyzyn <salyzyn@google.com>
+Cc: Dmitry Vyukov <dvyukov@google.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/core/seq/seq_clientmgr.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sound/core/seq/seq_clientmgr.c
++++ b/sound/core/seq/seq_clientmgr.c
+@@ -1970,7 +1970,7 @@ static int snd_seq_ioctl_remove_events(s
+                * No restrictions so for a user client we can clear
+                * the whole fifo
+                */
+-              if (client->type == USER_CLIENT)
++              if (client->type == USER_CLIENT && client->data.user.fifo)
+                       snd_seq_fifo_clear(client->data.user.fifo);
+       }
+ 

diff --git a/queue-3.18/series b/queue-3.18/series
index ba5c03594ff8f916825cdd10814d3aa58d3ce374..9a2699de69902ec76be2905737a8b79f77ee8116 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -16,3 +16,4 @@ usb-serial-cp210x-add-support-for-elv-tfd500.patch
 usb-serial-option-add-support-for-tp-link-lte-module.patch
 usb-serial-qcserial-add-dell-dw5818-dw5819.patch
 usb-serial-console-fix-use-after-free-after-failed-setup.patch
+alsa-seq-fix-missing-null-check-at-remove_events-ioctl.patch