From 34c3da777d3ef49457d2fb8ab17d62572ec27660 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 13 Jun 2019 11:13:04 +0200 Subject: [PATCH] 4.9-stable patches added patches: alsa-seq-cover-unsubscribe_port-in-list_mutex.patch --- ...cover-unsubscribe_port-in-list_mutex.patch | 37 +++++++++++++ ...ect-in-kernel-ioctl-calls-with-mutex.patch | 53 ------------------- queue-4.9/series | 2 +- 3 files changed, 38 insertions(+), 54 deletions(-) create mode 100644 queue-4.9/alsa-seq-cover-unsubscribe_port-in-list_mutex.patch delete mode 100644 queue-4.9/alsa-seq-protect-in-kernel-ioctl-calls-with-mutex.patch diff --git a/queue-4.9/alsa-seq-cover-unsubscribe_port-in-list_mutex.patch b/queue-4.9/alsa-seq-cover-unsubscribe_port-in-list_mutex.patch new file mode 100644 index 0000000000..9ee4b66a05 --- /dev/null +++ b/queue-4.9/alsa-seq-cover-unsubscribe_port-in-list_mutex.patch @@ -0,0 +1,37 @@ +From 7c32ae35fbf9cffb7aa3736f44dec10c944ca18e Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Fri, 12 Apr 2019 11:37:19 +0200 +Subject: ALSA: seq: Cover unsubscribe_port() in list_mutex + +From: Takashi Iwai + +commit 7c32ae35fbf9cffb7aa3736f44dec10c944ca18e upstream. + +The call of unsubscribe_port() which manages the group count and +module refcount from delete_and_unsubscribe_port() looks racy; it's +not covered by the group list lock, and it's likely a cause of the +reported unbalance at port deletion. Let's move the call inside the +group list_mutex to plug the hole. + +Reported-by: syzbot+e4c8abb920efa77bace9@syzkaller.appspotmail.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/core/seq/seq_ports.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/sound/core/seq/seq_ports.c ++++ b/sound/core/seq/seq_ports.c +@@ -550,10 +550,10 @@ static void delete_and_unsubscribe_port( + list_del_init(list); + grp->exclusive = 0; + write_unlock_irq(&grp->list_lock); +- up_write(&grp->list_mutex); + + if (!empty) + unsubscribe_port(client, port, grp, &subs->info, ack); ++ up_write(&grp->list_mutex); + } + + /* connect two ports */ diff --git a/queue-4.9/alsa-seq-protect-in-kernel-ioctl-calls-with-mutex.patch b/queue-4.9/alsa-seq-protect-in-kernel-ioctl-calls-with-mutex.patch deleted file mode 100644 index c086c8dbc3..0000000000 --- a/queue-4.9/alsa-seq-protect-in-kernel-ioctl-calls-with-mutex.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 92f88c2772ca91b85e854e7d5b628fe251942efd Mon Sep 17 00:00:00 2001 -From: Takashi Iwai -Date: Tue, 9 Apr 2019 17:35:22 +0200 -Subject: ALSA: seq: Protect in-kernel ioctl calls with mutex - -[ Upstream commit feb689025fbb6f0aa6297d3ddf97de945ea4ad32 ] - -ALSA OSS sequencer calls the ioctl function indirectly via -snd_seq_kernel_client_ctl(). While we already applied the protection -against races between the normal ioctls and writes via the client's -ioctl_mutex, this code path was left untouched. And this seems to be -the cause of still remaining some rare UAF as spontaneously triggered -by syzkaller. - -For the sake of robustness, wrap the ioctl_mutex also for the call via -snd_seq_kernel_client_ctl(), too. - -Reported-by: syzbot+e4c8abb920efa77bace9@syzkaller.appspotmail.com -Signed-off-by: Takashi Iwai -Signed-off-by: Sasha Levin ---- - sound/core/seq/seq_clientmgr.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c -index 09491b27092e..3b1b2e9fb33e 100644 ---- a/sound/core/seq/seq_clientmgr.c -+++ b/sound/core/seq/seq_clientmgr.c -@@ -2354,14 +2354,19 @@ int snd_seq_kernel_client_ctl(int clientid, unsigned int cmd, void *arg) - { - const struct ioctl_handler *handler; - struct snd_seq_client *client; -+ int err; - - client = clientptr(clientid); - if (client == NULL) - return -ENXIO; - - for (handler = ioctl_handlers; handler->cmd > 0; ++handler) { -- if (handler->cmd == cmd) -- return handler->func(client, arg); -+ if (handler->cmd == cmd) { -+ mutex_lock(&client->ioctl_mutex); -+ err = handler->func(client, arg); -+ mutex_unlock(&client->ioctl_mutex); -+ return err; -+ } - } - - pr_debug("ALSA: seq unknown ioctl() 0x%x (type='%c', number=0x%02x)\n", --- -2.20.1 - diff --git a/queue-4.9/series b/queue-4.9/series index 6ba609013f..b38c0b229e 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -41,7 +41,6 @@ arm-dts-imx6ul-specify-imx6ul_clk_ipg-as-ipg-clock-t.patch arm-dts-imx6sx-specify-imx6sx_clk_ipg-as-ipg-clock-t.patch arm-dts-imx6qdl-specify-imx6qdl_clk_ipg-as-ipg-clock.patch pci-rpadlpar-fix-leaked-device_node-references-in-ad.patch -alsa-seq-protect-in-kernel-ioctl-calls-with-mutex.patch platform-x86-intel_pmc_ipc-adding-error-handling.patch pci-rcar-fix-a-potential-null-pointer-dereference.patch pci-rcar-fix-64bit-msi-message-address-handling.patch @@ -55,3 +54,4 @@ arm-dts-exynos-always-enable-necessary-apio_1v8-and-.patch pwm-fix-deadlock-warning-when-removing-pwm-device.patch arm-exynos-fix-undefined-instruction-during-exynos54.patch revert-bluetooth-align-minimum-encryption-key-size-for-le-and-br-edr-connections.patch +alsa-seq-cover-unsubscribe_port-in-list_mutex.patch -- 2.39.2