From: Greg Kroah-Hartman Date: Mon, 16 Oct 2017 15:45:54 +0000 (+0200) Subject: 3.18-stable patches X-Git-Tag: v3.18.76~5 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=93acd19f91d6c425258bb4e87e4b27899ff64fe5;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..6d25f514a3e --- /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 +Date: Tue, 12 Jan 2016 12:38:02 +0100 +Subject: ALSA: seq: Fix missing NULL check at remove_events ioctl + +From: Takashi Iwai + +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 +Tested-by: Dmitry Vyukov +Signed-off-by: Takashi Iwai +Cc: Mark Salyzyn +Cc: Dmitry Vyukov +Signed-off-by: Greg Kroah-Hartman + +--- + 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 ba5c03594ff..9a2699de699 100644 --- 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