]> git.ipfire.org Git - thirdparty/kernel/stable.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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Jan 2018 08:29:29 +0000 (09:29 +0100)
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>
sound/core/oss/pcm_oss.c

index 68c272e65f43daccfe36c6b8cdd85fc861781cd6..6709a1f380a179ebf97108706a3b5fd732fcc61b 100644 (file)
@@ -1417,6 +1417,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;
@@ -1502,6 +1506,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;