]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
ALSA: pcm: Abort properly at pending signal in OSS read/write loops
authorTakashi Iwai <tiwai@suse.de>
Mon, 8 Jan 2018 12:58:31 +0000 (13:58 +0100)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Tue, 13 Mar 2018 10:47:20 +0000 (11:47 +0100)
BugLink: http://bugs.launchpad.net/bugs/1745266
commit 29159a4ed7044c52e3e2cf1a9fb55cec4745c60b upstream.

The loops for read and write in PCM OSS emulation have no proper check
of pending signals, and they keep processing even after user tries to
break.  This results in a very long delay, often seen as RCU stall
when a huge unprocessed bytes remain queued.  The bug could be easily
triggered by syzkaller.

As a simple workaround, this patch adds the proper check of pending
signals and aborts the loop appropriately.

Reported-by: syzbot+993cb4cfcbbff3947c21@syzkaller.appspotmail.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
sound/core/oss/pcm_oss.c

index 4a5bcf178982e98eb30ac55ac992ec071fe72cf0..d2a9e0fd46b0e18122e118c0d2294bb43857533a 100644 (file)
@@ -1416,6 +1416,10 @@ static ssize_t snd_pcm_oss_write1(struct snd_pcm_substream *substream, const cha
                            tmp != runtime->oss.period_bytes)
                                break;
                }
+               if (signal_pending(current)) {
+                       tmp = -ERESTARTSYS;
+                       goto err;
+               }
        }
        mutex_unlock(&runtime->oss.params_lock);
        return xfer;
@@ -1501,6 +1505,10 @@ static ssize_t snd_pcm_oss_read1(struct snd_pcm_substream *substream, char __use
                        bytes -= tmp;
                        xfer += tmp;
                }
+               if (signal_pending(current)) {
+                       tmp = -ERESTARTSYS;
+                       goto err;
+               }
        }
        mutex_unlock(&runtime->oss.params_lock);
        return xfer;