Commit bf3412d9 authored by Takashi Iwai's avatar Takashi Iwai Committed by Kleber Sacilotto de Souza

ALSA: pcm: Abort properly at pending signal in OSS read/write loops

BugLink: http://bugs.launchpad.net/bugs/1745266

commit 29159a4e 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: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
parent 279b8f0a
...@@ -1416,6 +1416,10 @@ static ssize_t snd_pcm_oss_write1(struct snd_pcm_substream *substream, const cha ...@@ -1416,6 +1416,10 @@ static ssize_t snd_pcm_oss_write1(struct snd_pcm_substream *substream, const cha
tmp != runtime->oss.period_bytes) tmp != runtime->oss.period_bytes)
break; break;
} }
if (signal_pending(current)) {
tmp = -ERESTARTSYS;
goto err;
}
} }
mutex_unlock(&runtime->oss.params_lock); mutex_unlock(&runtime->oss.params_lock);
return xfer; return xfer;
...@@ -1501,6 +1505,10 @@ static ssize_t snd_pcm_oss_read1(struct snd_pcm_substream *substream, char __use ...@@ -1501,6 +1505,10 @@ static ssize_t snd_pcm_oss_read1(struct snd_pcm_substream *substream, char __use
bytes -= tmp; bytes -= tmp;
xfer += tmp; xfer += tmp;
} }
if (signal_pending(current)) {
tmp = -ERESTARTSYS;
goto err;
}
} }
mutex_unlock(&runtime->oss.params_lock); mutex_unlock(&runtime->oss.params_lock);
return xfer; return xfer;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment