Commit 6a9ce6b6 authored by Federico Vaga's avatar Federico Vaga Committed by Greg Kroah-Hartman

Staging: comedi: fix signal handling in read and write

After sleeping on a wait queue, signal_pending(current) should be
checked (not before sleeping).
Acked-by: default avatarAlessandro Rubini <rubini@gnudd.com>
Signed-off-by: default avatarFederico Vaga <federico.vaga@gmail.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent df30b21c
...@@ -1673,11 +1673,11 @@ static ssize_t comedi_write(struct file *file, const char __user *buf, ...@@ -1673,11 +1673,11 @@ static ssize_t comedi_write(struct file *file, const char __user *buf,
retval = -EAGAIN; retval = -EAGAIN;
break; break;
} }
schedule();
if (signal_pending(current)) { if (signal_pending(current)) {
retval = -ERESTARTSYS; retval = -ERESTARTSYS;
break; break;
} }
schedule();
if (!s->busy) if (!s->busy)
break; break;
if (s->busy != file) { if (s->busy != file) {
...@@ -1780,11 +1780,11 @@ static ssize_t comedi_read(struct file *file, char __user *buf, size_t nbytes, ...@@ -1780,11 +1780,11 @@ static ssize_t comedi_read(struct file *file, char __user *buf, size_t nbytes,
retval = -EAGAIN; retval = -EAGAIN;
break; break;
} }
schedule();
if (signal_pending(current)) { if (signal_pending(current)) {
retval = -ERESTARTSYS; retval = -ERESTARTSYS;
break; break;
} }
schedule();
if (!s->busy) { if (!s->busy) {
retval = 0; retval = 0;
break; break;
......
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